[Git][ghc/ghc][wip/ghc-internals-move] 2 commits: warning

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/ghc-internals-move at Glasgow Haskell Compiler / GHC


Commits:
31548c65 by Ben Gamari at 2024-01-23T17:54:09-05:00
warning

- - - - -
11fa889a by Ben Gamari at 2024-01-23T17:55:40-05:00
Windows

- - - - -


2 changed files:

- libraries/ghc-internal/src/GHC/Windows.hs
- libraries/ghc-internal/src/System/Environment/ExecutablePath.hsc


Changes:

=====================================
libraries/ghc-internal/src/GHC/Windows.hs
=====================================
@@ -79,7 +79,7 @@ module GHC.Windows (
     ) where
 
 import Data.Bits (finiteBitSize, shiftL, shiftR, (.|.), (.&.))
-import Data.Char
+import GHC.Char
 import Data.OldList
 import Data.Maybe
 import Data.Word


=====================================
libraries/ghc-internal/src/System/Environment/ExecutablePath.hsc
=====================================
@@ -37,7 +37,6 @@ executablePath = Nothing
 import GHC.Base
 import GHC.IO (FilePath)
 import GHC.Real
-import Data.Functor
 #if defined(darwin_HOST_OS)
 import Control.Exception (catch, throw)
 import Data.Word
@@ -48,18 +47,21 @@ import Foreign.Storable
 import System.IO.Error (isDoesNotExistError)
 import System.Posix.Internals
 #elif defined(linux_HOST_OS)
+import Data.Functor
 import Data.List (isSuffixOf)
 import Foreign.C
 import Foreign.Marshal.Array
 import System.Posix.Internals
 #elif defined(solaris2_HOST_OS)
 import Control.Exception (catch, throw)
+import Data.Functor
 import Foreign.C
 import Foreign.Marshal.Array
 import System.IO.Error (isDoesNotExistError)
 import System.Posix.Internals
 #elif defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS)
 import Control.Exception (catch, throw)
+import Data.Functor
 import Foreign.C
 import Foreign.Marshal.Alloc
 import Foreign.Marshal.Array
@@ -71,6 +73,7 @@ import System.Posix.Internals
 #include <sys/sysctl.h>
 #elif defined(mingw32_HOST_OS)
 import Control.Exception
+import Data.Functor
 import Data.List (isPrefixOf)
 import Data.Word
 import Foreign.C



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9a3c33f2e1a2658df032dbe1c0698557ff5f9720...11fa889a038fb93c784225704726f09cb0a4774a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9a3c33f2e1a2658df032dbe1c0698557ff5f9720...11fa889a038fb93c784225704726f09cb0a4774a
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240123/7c8a22dd/attachment-0001.html>