Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 99f77e23 by Rodrigo Mesquita at 2026-05-12T17:11:01+01:00 more fixes - - - - - 4 changed files: - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/Tc/Deriv/Utils.hs - libraries/ghc-internal/src/GHC/Internal/Err.hs Changes: ===================================== compiler/GHC/HsToCore.hs ===================================== @@ -64,7 +64,7 @@ import GHC.Builtin.WiredIn.Prim import GHC.Builtin.WiredIn.Types import GHC.Builtin.WiredIn.Ids ( mkRepPolyIdConcreteTyVars ) -import GHC.Data.Maybe ( expectJust, isJust, MaybeErr (..) ) +import GHC.Data.Maybe ( expectJust, MaybeErr (..) ) import GHC.Data.OrdList import GHC.Data.SizedSeq ( sizeSS ) @@ -101,7 +101,6 @@ import GHC.Runtime.Interpreter (interpreterProfiled) import GHC.Types.Unique.FM import GHC.Iface.Load (KnownEntitySource(..), lookupKnownKeyName) import GHC.HsToCore.Types (DsGblEnv(..)) -import GHC.Types.Name.Env (emptyNameEnv) {- ************************************************************************ ===================================== compiler/GHC/HsToCore/Monad.hs ===================================== @@ -26,7 +26,7 @@ module GHC.HsToCore.Monad ( dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon, dsLookupConLike, dsLookupKnownKeyTyCon, dsLookupKnownKeyDataCon, dsLookupKnownKeyId, - dsLookupKnownKeyName, dsLookupKnownOccName, + dsLookupKnownKeyName, dsLookupKnownOccName, dsGetKnownKeySource, dsLookupKnownOccId, dsLookupKnownOccTyCon, dsLookupKnownOccDataCon, DsMetaEnv, DsMetaVal(..), dsGetMetaEnv, dsLookupMetaEnv, dsExtendMetaEnv, ===================================== compiler/GHC/Tc/Deriv/Utils.hs ===================================== @@ -66,7 +66,6 @@ import GHC.Types.SrcLoc import GHC.Types.Var.Set import GHC.Builtin.KnownKeys -import GHC.Builtin.TH (liftClassKey) import GHC.Utils.Misc import GHC.Utils.Outputable ===================================== libraries/ghc-internal/src/GHC/Internal/Err.hs ===================================== @@ -29,6 +29,7 @@ import GHC.Internal.Types import GHC.Internal.Stack.Types import GHC.Internal.Magic import GHC.Internal.Prim +import GHC.Internal.Classes.IP as Rebindable import {-# SOURCE #-} GHC.Internal.Exception ( errorCallWithCallStackException View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/99f77e238c27c11fa306d9e2b1953211... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/99f77e238c27c11fa306d9e2b1953211... You're receiving this email because of your account on gitlab.haskell.org.