Doctests: Better way to bring Unicode/unicode into scope

mmhat · Aug 11, 2024 · 1faf77a · 1faf77a
1 parent b2b30f0
commit 1faf77a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/examples/Utils.hs b/examples/Utils.hs
@@ -1,5 +1,6 @@
+-- FlexibleContexts is needed for GHC <9.8
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE FlexibleContexts #-} -- Needed for GHC <9.8
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RoleAnnotations #-}

diff --git a/os-string-aeson-internal/System/OsString/Aeson/Internal.hs b/os-string-aeson-internal/System/OsString/Aeson/Internal.hs
@@ -9,7 +9,11 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module System.OsString.Aeson.Internal where
+module System.OsString.Aeson.Internal (
+    module System.OsString.Aeson.Internal,
+    Platform.Unicode,
+    Platform.unicode,
+) where
 
 import Control.Monad.Catch (MonadThrow)
 import Data.Aeson.Types (

diff --git a/src/System/OsString/Aeson.hs b/src/System/OsString/Aeson.hs
@@ -159,31 +159,20 @@ module System.OsString.Aeson (
     -- * Text encodings
     TextEncoding,
     IsTextEncoding,
-    PlatformDependent.Unicode,
+    Unicode,
     Utf8,
     Utf16LE,
-    PlatformDependent.unicode,
+    unicode,
 )
 where
 
 import System.IO (TextEncoding)
 import System.OsString.Aeson.Internal
 import System.OsString.Aeson.Internal.Types
 
-#if defined(mingw32_HOST_OS)
-import System.OsString.Aeson.Internal.Windows qualified as PlatformDependent
-#else
-import System.OsString.Aeson.Internal.Posix qualified as PlatformDependent
-#endif
-
 -- $setup
 -- >>> :set -XOverloadedStrings
 -- >>> :set -XQuasiQuotes
 -- >>> :set -XTypeApplications
 -- >>> import Data.Aeson qualified
 -- >>> import System.OsString (osstr)
-#if defined(mingw32_HOST_OS)
--- >>> import System.OsString.Aeson.Internal.Windows (Unicode, unicode)
-#else
--- >>> import System.OsString.Aeson.Internal.Posix (Unicode, unicode)
-#endif