Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 93a9b714 by Rodrigo Mesquita at 2026-05-19T11:21:31+01:00 fix warning - - - - - 5197d507 by Rodrigo Mesquita at 2026-05-19T11:45:06+01:00 fix, builds stage2 - - - - - 2 changed files: - compiler/GHC/Utils/Binary.hs - libraries/base/src/GHC/Base.hs Changes: ===================================== compiler/GHC/Utils/Binary.hs ===================================== @@ -2291,8 +2291,8 @@ instance Binary KindRep where 2 -> KindRepApp <$> get bh <*> get bh 3 -> KindRepFun <$> get bh <*> get bh #if __GLASGOW_HASKELL__ > 1000 - 4 -> KindRepType - 5 -> KindRepConstraint + 4 -> pure KindRepType + 5 -> pure KindRepConstraint 6 -> KindRepTypeLit <$> get bh <*> get bh #else 4 -> KindRepTYPE <$> get bh ===================================== libraries/base/src/GHC/Base.hs ===================================== @@ -41,10 +41,10 @@ module GHC.Base , gtWord, geWord, leWord, ltWord, compareWord, compareWord# -- * C Strings - , unpackCString#, unpackAppendCString#, unpackFoldrCString# - , cstringLength# - , unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8# - , unpackNBytes# + , CS.unpackCString#, CS.unpackAppendCString#, CS.unpackFoldrCString# + , CS.cstringLength# + , CS.unpackCStringUtf8#, CS.unpackAppendCStringUtf8#, CS.unpackFoldrCStringUtf8# + , CS.unpackNBytes# -- * Magic combinators , inline, noinline, lazy, oneShot, runRW#, seq#, DataToTag(..) @@ -394,7 +394,17 @@ import GHC.Internal.Err import GHC.Internal.IO (seq#) import GHC.Internal.Magic.Dict import GHC.Internal.Maybe +import qualified GHC.Types as CS ( + unpackCString#, unpackAppendCString#, unpackFoldrCString#, + cstringLength#, + unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8#, + unpackNBytes# + ) import GHC.Types hiding ( + unpackCString#, unpackAppendCString#, unpackFoldrCString#, + cstringLength#, + unpackCStringUtf8#, unpackAppendCStringUtf8#, unpackFoldrCStringUtf8#, + unpackNBytes#, Unit#, Solo#(..), Tuple0#, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1e9e04cfd7b3f67c9b0e06797bdd480... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1e9e04cfd7b3f67c9b0e06797bdd480... You're receiving this email because of your account on gitlab.haskell.org.