Fix typo

Cabal/Distribution/Simple/GHC.hs

@@ -53,13 +53,13 @@ module Distribution.Simple.GHC (
         isDynamic,
         getGlobalPackageDB,
         pkgRoot,
-        -- * Constructing and deconstsructing GHC environment files
+        -- * Constructing and deconstructing GHC environment files
         Internal.GhcEnvironmentFileEntry(..),
         Internal.simpleGhcEnvironmentFile,
         Internal.renderGhcEnvironmentFile,
         Internal.writeGhcEnvironmentFile,
         Internal.ghcPlatformAndVersionString,
-        readEnvironmentFile,
+        readGhcEnvironmentFile,
         ParseErrorExc(..),
         -- * Version-specific implementation quirks
         getImplInfo,

Cabal/Distribution/Simple/GHC/EnvironmentParser.hs

@@ -4,7 +4,7 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 module Distribution.Simple.GHC.EnvironmentParser 
-    ( readEnvironmentFile, ParseErrorExc(..) ) where
+    ( readGhcEnvironmentFile, ParseErrorExc(..) ) where
 
 import Prelude ()
 import Distribution.Compat.Prelude
@@ -48,7 +48,7 @@ instance Exception ParseErrorExc
 parseEnvironmentFile :: Parser [GhcEnvironmentFileEntry]
 parseEnvironmentFile = parseEnvironmentFileLine `P.endBy` P.endOfLine
 
-readEnvironmentFile :: FilePath -> IO [GhcEnvironmentFileEntry]
-readEnvironmentFile path =
+readGhcEnvironmentFile :: FilePath -> IO [GhcEnvironmentFileEntry]
+readGhcEnvironmentFile path =
     either (throwIO . ParseErrorExc) return =<<
         parseFromFile parseEnvironmentFile path

cabal-install/Distribution/Client/CmdInstall.hs

@@ -23,7 +23,6 @@ import Distribution.Client.Compat.Prelude
 import Distribution.Client.ProjectOrchestration
 import Distribution.Client.CmdErrorMessages
 import Distribution.Client.CmdSdist
-import Distribution.Client.CmdInstall.EnvironmentParser
 
 import Distribution.Client.Setup
          ( GlobalFlags(..), ConfigFlags(..), ConfigExFlags, InstallFlags )
@@ -80,7 +79,7 @@ import Distribution.Simple.Compiler
 import Distribution.Simple.GHC
          ( ghcPlatformAndVersionString 
          , GhcImplInfo(..), getImplInfo
-         , GhcEnvironmentFileEntry(..), renderGhcEnvironmentFile )
+         , GhcEnvironmentFileEntry(..), renderGhcEnvironmentFile, readEnvironmentFile )
 import Distribution.Types.UnitId
          ( UnitId )
 import Distribution.Types.UnqualComponentName