Ben Gamari pushed to branch wip/T26164 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Driver/Backpack.hs
    ... ... @@ -35,6 +35,8 @@ import GHC.Driver.Env
    35 35
     import GHC.Driver.Errors
    
    36 36
     import GHC.Driver.Errors.Types
    
    37 37
     
    
    38
    +import GHC.Hs
    
    39
    +import GHC.Unit.Module.ModIface
    
    38 40
     import GHC.Parser
    
    39 41
     import GHC.Parser.Header
    
    40 42
     import GHC.Parser.Lexer
    
    ... ... @@ -42,7 +44,6 @@ import GHC.Parser.Annotation
    42 44
     
    
    43 45
     import GHC.Rename.Names
    
    44 46
     
    
    45
    -import GHC hiding (Failed, Succeeded)
    
    46 47
     import GHC.Tc.Utils.Monad
    
    47 48
     import GHC.Iface.Recomp
    
    48 49
     
    
    ... ... @@ -78,6 +79,8 @@ import GHC.Data.FastString
    78 79
     import qualified GHC.Data.EnumSet as EnumSet
    
    79 80
     import qualified GHC.Data.ShortText as ST
    
    80 81
     
    
    82
    +import Language.Haskell.Syntax
    
    83
    +
    
    81 84
     import Data.List ( partition )
    
    82 85
     import System.Exit
    
    83 86
     import Control.Monad
    

  • compiler/GHC/Driver/Session/Units.hs
    ... ... @@ -4,10 +4,6 @@
    4 4
     {-# LANGUAGE TupleSections #-}
    
    5 5
     module GHC.Driver.Session.Units (initMake, initMulti) where
    
    6 6
     
    
    7
    --- The official GHC API
    
    8
    -import qualified GHC
    
    9
    -import GHC              (parseTargetFiles, Ghc, GhcMonad(..))
    
    10
    -
    
    11 7
     import GHC.Driver.Env
    
    12 8
     import GHC.Driver.Errors
    
    13 9
     import GHC.Driver.Errors.Types