Merge branch 'removal-os-string'

haskell · Nov 25, 2023 · b55465e · b55465e
2 parents 18c4e3a + 931430f
commit b55465e
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 3,255 deletions.
diff --git a/Generate.hs b/Generate.hs
@@ -35,10 +35,10 @@ main = do
  ,"import GHC.IO.Encoding.UTF16 ( mkUTF16le )"
  ,"import GHC.IO.Encoding.UTF8 ( mkUTF8 )"
  ,"import System.OsString.Internal.Types"
- ,"import System.OsPath.Encoding.Internal"
+ ,"import System.OsString.Encoding.Internal"
  ,"import qualified Data.Char as C"
- ,"import qualified System.OsPath.Data.ByteString.Short as SBS"
- ,"import qualified System.OsPath.Data.ByteString.Short.Word16 as SBS16"
+ ,"import qualified System.OsString.Data.ByteString.Short as SBS"
+ ,"import qualified System.OsString.Data.ByteString.Short.Word16 as SBS16"
  ,"import qualified System.FilePath.Windows as W"
  ,"import qualified System.FilePath.Posix as P"
 #ifdef GHC_MAKE

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
@@ -138,8 +138,8 @@ import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 import GHC.IO.Encoding.UTF16 ( mkUTF16le )
 import qualified GHC.Foreign as GHC
 import Data.Word ( Word16 )
-import System.OsPath.Data.ByteString.Short.Word16
-import System.OsPath.Data.ByteString.Short ( packCStringLen )
+import System.OsString.Data.ByteString.Short.Word16
+import System.OsString.Data.ByteString.Short ( packCStringLen )
 #define CHAR Word16
 #define STRING ShortByteString
 #define FILEPATH ShortByteString
@@ -148,7 +148,7 @@ import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 import qualified GHC.Foreign as GHC
 import GHC.IO.Encoding.UTF8 ( mkUTF8 )
 import Data.Word ( Word8 )
-import System.OsPath.Data.ByteString.Short
+import System.OsString.Data.ByteString.Short
 #define CHAR Word8
 #define STRING ShortByteString
 #define FILEPATH ShortByteString

diff --git a/System/OsPath/Data/ByteString/Short.hs b/System/OsPath/Data/ByteString/Short.hs