Fix tests

Author: hasufell

Generate.hs

@@ -34,11 +34,11 @@ main = do
         ,"import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )"
         ,"import GHC.IO.Encoding.UTF16 ( mkUTF16le )"
         ,"import GHC.IO.Encoding.UTF8 ( mkUTF8 )"
-        ,"import System.OsString.Internal.Types.Hidden"
-        ,"import System.OsPath.Encoding.Internal.Hidden"
+        ,"import System.OsString.Internal.Types"
+        ,"import System.OsPath.Encoding.Internal"
         ,"import qualified Data.Char as C"
-        ,"import qualified System.OsPath.Data.ByteString.Short.Hidden as SBS"
-        ,"import qualified System.OsPath.Data.ByteString.Short.Word16.Hidden as SBS16"
+        ,"import qualified System.OsPath.Data.ByteString.Short as SBS"
+        ,"import qualified System.OsPath.Data.ByteString.Short.Word16 as SBS16"
         ,"import qualified System.FilePath.Windows as W"
         ,"import qualified System.FilePath.Posix as P"
 #ifdef GHC_MAKE

System/FilePath/Internal.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE MultiWayIf #-}
 
 -- This template expects CPP definitions for:
 --     MODULE_NAME = Posix | Windows

tests/filepath-tests/TestGen.hs

@@ -14,11 +14,11 @@ import Data.String
 import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 import GHC.IO.Encoding.UTF16 ( mkUTF16le )
 import GHC.IO.Encoding.UTF8 ( mkUTF8 )
-import System.OsString.Internal.Types.Hidden
-import System.OsPath.Encoding.Internal.Hidden
+import System.OsString.Internal.Types
+import System.OsPath.Encoding.Internal
 import qualified Data.Char as C
-import qualified System.OsPath.Data.ByteString.Short.Hidden as SBS
-import qualified System.OsPath.Data.ByteString.Short.Word16.Hidden as SBS16
+import qualified System.OsPath.Data.ByteString.Short as SBS
+import qualified System.OsPath.Data.ByteString.Short.Word16 as SBS16
 import qualified System.FilePath.Windows as W
 import qualified System.FilePath.Posix as P
 import qualified System.OsPath.Windows as AFP_W