Avoid partial last in autogen Paths_<pkg>.hs

haskell · Oct 6, 2024 · b9e8666 · b9e8666
1 parent 47139c5
commit b9e8666
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
@@ -69,7 +69,7 @@ render z_root = execWriter $ do
     return ()
   tell "\n"
   tell "import qualified Control.Exception as Exception\n"
-  tell "import qualified Data.List as List\n"
+  tell "import qualified Data.List.NonEmpty as NE\n"
   tell "import Data.Version (Version(..))\n"
   tell "import System.Environment (getEnv)\n"
   tell "import Prelude\n"
@@ -306,9 +306,9 @@ render z_root = execWriter $ do
   tell "joinFileName \"\"  fname = fname\n"
   tell "joinFileName \".\" fname = fname\n"
   tell "joinFileName dir \"\"    = dir\n"
-  tell "joinFileName dir fname\n"
-  tell "  | isPathSeparator (List.last dir) = dir ++ fname\n"
-  tell "  | otherwise                       = dir ++ pathSeparator : fname\n"
+  tell "joinFileName dir@(c:cs) fname\n"
+  tell "  | isPathSeparator (NE.last (c NE.:| cs)) = dir ++ fname\n"
+  tell "  | otherwise                              = dir ++ pathSeparator : fname\n"
   tell "\n"
   tell "pathSeparator :: Char\n"
   if (zIsWindows z_root)