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

Commits:

2 changed files:

Changes:

  • compiler/GHC/Utils/Binary.hs
    ... ... @@ -2291,8 +2291,8 @@ instance Binary KindRep where
    2291 2291
               2 -> KindRepApp <$> get bh <*> get bh
    
    2292 2292
               3 -> KindRepFun <$> get bh <*> get bh
    
    2293 2293
     #if __GLASGOW_HASKELL__ > 1000
    
    2294
    -          4 -> KindRepType
    
    2295
    -          5 -> KindRepConstraint
    
    2294
    +          4 -> pure KindRepType
    
    2295
    +          5 -> pure KindRepConstraint
    
    2296 2296
               6 -> KindRepTypeLit <$> get bh <*> get bh
    
    2297 2297
     #else
    
    2298 2298
               4 -> KindRepTYPE <$> get bh
    

  • libraries/base/src/GHC/Base.hs
    ... ... @@ -41,10 +41,10 @@ module GHC.Base
    41 41
         , gtWord, geWord, leWord, ltWord, compareWord, compareWord#
    
    42 42
     
    
    43 43
           -- * C Strings
    
    44
    -    , unpackCString#, unpackAppendCString#, unpackFoldrCString#
    
    45
    -    , cstringLength#
    
    46
    -    , unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8#
    
    47
    -    , unpackNBytes#
    
    44
    +    , CS.unpackCString#, CS.unpackAppendCString#, CS.unpackFoldrCString#
    
    45
    +    , CS.cstringLength#
    
    46
    +    , CS.unpackCStringUtf8#, CS.unpackAppendCStringUtf8#, CS.unpackFoldrCStringUtf8#
    
    47
    +    , CS.unpackNBytes#
    
    48 48
     
    
    49 49
           -- * Magic combinators
    
    50 50
         , inline, noinline, lazy, oneShot, runRW#, seq#, DataToTag(..)
    
    ... ... @@ -394,7 +394,17 @@ import GHC.Internal.Err
    394 394
     import GHC.Internal.IO (seq#)
    
    395 395
     import GHC.Internal.Magic.Dict
    
    396 396
     import GHC.Internal.Maybe
    
    397
    +import qualified GHC.Types as CS (
    
    398
    +  unpackCString#, unpackAppendCString#, unpackFoldrCString#,
    
    399
    +  cstringLength#,
    
    400
    +  unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8#,
    
    401
    +  unpackNBytes#
    
    402
    +  )
    
    397 403
     import GHC.Types hiding (
    
    404
    +  unpackCString#, unpackAppendCString#, unpackFoldrCString#,
    
    405
    +  cstringLength#,
    
    406
    +  unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8#,
    
    407
    +  unpackNBytes#,
    
    398 408
       Unit#,
    
    399 409
       Solo#(..),
    
    400 410
       Tuple0#,