Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable.hsc
    ... ... @@ -25,6 +25,7 @@ import GHC.Internal.Maybe (Maybe(..))
    25 25
     import GHC.Internal.Foreign.Ptr
    
    26 26
     import GHC.Internal.Foreign.Storable
    
    27 27
     import GHC.Internal.Num as Rebindable( fromInteger )   -- For known-key names
    
    28
    +import qualified GHC.Internal.Stack.Types as Rebindable
    
    28 29
     
    
    29 30
     -------------------------------------------------------------------------
    
    30 31
     -- Profiling specific code
    

  • libraries/ghc-internal/src/GHC/Internal/IO/Windows/Encoding.hs
    ... ... @@ -26,6 +26,7 @@ module GHC.Internal.IO.Windows.Encoding
    26 26
     
    
    27 27
     import GHC.Internal.Base (String, assert, return, ($), (.))
    
    28 28
     import qualified GHC.Internal.Base as Rebindable ((>>=))
    
    29
    +import qualified GHC.Internal.IO.Exception as Rebindable (assertError)
    
    29 30
     import GHC.Internal.Classes (Eq(..), Ord(..))
    
    30 31
     import qualified GHC.Internal.Num as Rebindable (fromInteger)
    
    31 32
     import GHC.Internal.Types (Int)
    

  • libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs
    ... ... @@ -50,6 +50,7 @@ import qualified GHC.Internal.Types as GHC (unpackCString#, unpackCStringUtf8#)
    50 50
     import           GHC.Internal.IO
    
    51 51
     import           GHC.Internal.Base
    
    52 52
     import           GHC.Internal.Show
    
    53
    +import qualified GHC.Internal.Data.Typeable.Internal as Rebindable
    
    53 54
     
    
    54 55
     {-
    
    55 56
       JSVal is a boxed type that can be used as FFI