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

Commits:

2 changed files:

Changes:

  • libraries/base/src/GHC/Essentials.hs
    ... ... @@ -146,7 +146,7 @@ module GHC.Essentials
    146 146
     
    
    147 147
         -- Static pointers
    
    148 148
         , IsStatic( fromStaticPtr ), makeStatic
    
    149
    -    , StaticPtr( StaticPtr ), StaticPtrInfo( StaticPtrInfo )
    
    149
    +    , StaticPtr, StaticPtrInfo( StaticPtrInfo )
    
    150 150
     
    
    151 151
         -- Stable pointers
    
    152 152
         , StablePtr, newStablePtr
    
    ... ... @@ -305,7 +305,7 @@ import GHC.Internal.Data.Foldable( Foldable(..), null, all )
    305 305
     import GHC.Internal.Data.Traversable( Traversable, traverse )
    
    306 306
     import GHC.Internal.Float
    
    307 307
     import GHC.Internal.IO( seq# )
    
    308
    -import GHC.Internal.Control.Monad( fail, guard )
    
    308
    +import GHC.Internal.Control.Monad( MonadFail, fail, guard )
    
    309 309
     import GHC.Internal.Control.Monad.Fix( mfix, loop )
    
    310 310
     import GHC.Internal.Control.Monad.Zip( mzip )
    
    311 311
     import GHC.Internal.Control.Arrow( arr, first, app, (|||) )
    
    ... ... @@ -326,7 +326,7 @@ import GHC.Internal.Word( Word8(W8#), Word16(W16#), Word32(W32#), Word64(W64#) )
    326 326
     
    
    327 327
     import GHC.Internal.Unsafe.Coerce( UnsafeEquality(..), unsafeEqualityProof, unsafeCoerce# )
    
    328 328
     
    
    329
    -import GHC.Internal.StaticPtr( IsStatic(..), StaticPtr, StaticPtrInfo(..) )
    
    329
    +import GHC.Internal.StaticPtr( IsStatic(..), StaticPtr(..), StaticPtrInfo(..) )
    
    330 330
     import GHC.Internal.StaticPtr.Internal( makeStatic )
    
    331 331
     
    
    332 332
     import GHC.Internal.Stable( StablePtr, newStablePtr )
    

  • libraries/ghc-internal/src/GHC/Internal/StaticPtr.hs
    ... ... @@ -40,7 +40,7 @@
    40 40
     -----------------------------------------------------------------------------
    
    41 41
     
    
    42 42
     module GHC.Internal.StaticPtr
    
    43
    -  ( StaticPtr
    
    43
    +  ( StaticPtr(..)
    
    44 44
       , deRefStaticPtr
    
    45 45
       , StaticKey
    
    46 46
       , staticKey