Decomission the last use case of packAscii

Author: Bodigrim

Codec/Archive/Tar/Index/Internal.hs

@@ -171,15 +171,16 @@ toComponentIds table =
     lookupComponents []
   . filter (/= BS.Char8.singleton '.')
   . splitDirectories
-  . packAscii
+  . posixToByteString
+  . toPosixString
   where
     lookupComponents cs' []     = Just (reverse cs')
     lookupComponents cs' (c:cs) = case StringTable.lookup table c of
       Nothing  -> Nothing
       Just cid -> lookupComponents (cid:cs') cs
 
 fromComponentId :: StringTable PathComponentId -> PathComponentId -> FilePath
-fromComponentId table = BS.Char8.unpack . StringTable.index table
+fromComponentId table = fromPosixString . byteToPosixString . StringTable.index table
 
 -- | All the files in the index with their corresponding 'TarEntryOffset's.
 --

Codec/Archive/Tar/PackAscii.hs

@@ -1,37 +1,27 @@
 {-# LANGUAGE PackageImports #-}
 
 module Codec.Archive.Tar.PackAscii
-  ( packAscii
-  , toPosixString
+  ( toPosixString
   , fromPosixString
   , posixToByteString
   , byteToPosixString
   ) where
 
-import qualified Data.ByteString.Char8 as BS.Char8
+import Data.ByteString (ByteString)
 import qualified Data.ByteString.Short as Sh
-import Data.Char
-import GHC.Stack
 import System.IO.Unsafe (unsafePerformIO)
 import "os-string" System.OsString.Posix (PosixString)
 import qualified "os-string" System.OsString.Posix as PS
 import qualified "os-string" System.OsString.Internal.Types as PS
 
--- | We should really migrate to @OsPath@ from @filepath@ package,
--- but for now let's not corrupt data silently.
-packAscii :: HasCallStack => FilePath -> BS.Char8.ByteString
-packAscii xs
-  | all isAscii xs = BS.Char8.pack xs
-  | otherwise = error $ "packAscii: only ASCII filenames are supported, but got " ++ xs
-
 toPosixString :: FilePath -> PosixString
 toPosixString = unsafePerformIO . PS.encodeFS
 
 fromPosixString :: PosixString -> FilePath
 fromPosixString = unsafePerformIO . PS.decodeFS
 
-posixToByteString :: PosixString -> BS.Char8.ByteString
+posixToByteString :: PosixString -> ByteString
 posixToByteString = Sh.fromShort . PS.getPosixString
 
-byteToPosixString :: BS.Char8.ByteString -> PosixString
+byteToPosixString :: ByteString -> PosixString
 byteToPosixString = PS.PosixString . Sh.toShort