diff options
| author | Bartłomiej Cieślar <bcieslar2001@gmail.com> | 2023-05-10 16:24:19 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-05-12 23:51:06 -0400 |
| commit | 5cad28e73bf9a1a535fa9ed22800156c1ba2e6c8 (patch) | |
| tree | 619d94d4a1bd477d3c9da9cc0834f2923502c1cf /compiler/GHC/Tc/Instance/Class.hs | |
| parent | 8b9b7dbc913b66795c283683c7fe1fb48672666d (diff) | |
| download | haskell-5cad28e73bf9a1a535fa9ed22800156c1ba2e6c8.tar.gz | |
Cleanup of dynflags override in export renaming
The deprecation warnings are normally emitted whenever the name's GRE is being looked up, which calls the GHC.Rename.Env.addUsedGRE function. We do not want those warnings to be emitted when renaming export lists, so they are artificially turned off by removing all warning categories from DynFlags at the beginning of GHC.Tc.Gen.Export.rnExports. This commit removes that dependency by unifying the function used for GRE lookup in lookup_ie to lookupGreAvailRn and disabling the call to addUsedGRE in said function (the warnings are also disabled in a call to lookupSubBndrOcc_helper in lookupChildrenExport), as per #17957. This commit also changes the setting for whether to warn about deprecated names in addUsedGREs to be an explicit enum instead of a boolean.
Diffstat (limited to 'compiler/GHC/Tc/Instance/Class.hs')
| -rw-r--r-- | compiler/GHC/Tc/Instance/Class.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/Tc/Instance/Class.hs b/compiler/GHC/Tc/Instance/Class.hs index 349ea1e34c..43fc9dbdb9 100644 --- a/compiler/GHC/Tc/Instance/Class.hs +++ b/compiler/GHC/Tc/Instance/Class.hs @@ -23,7 +23,7 @@ import GHC.Tc.Utils.TcMType import GHC.Tc.Types.Evidence import GHC.Tc.Types.Origin (InstanceWhat (..), SafeOverlapping) import GHC.Tc.Instance.Family( tcGetFamInstEnvs, tcInstNewTyCon_maybe, tcLookupDataFamInst ) -import GHC.Rename.Env( addUsedGRE ) +import GHC.Rename.Env( addUsedGRE, DeprecationWarnings(EnableDeprecationWarnings) ) import GHC.Builtin.Types import GHC.Builtin.Types.Prim @@ -949,7 +949,7 @@ matchHasField dflags short_cut clas tys -- it must not be higher-rank. ; if not (isNaughtyRecordSelector sel_id) && isTauTy sel_ty then do { -- See Note [Unused name reporting and HasField] - addUsedGRE True gre + addUsedGRE EnableDeprecationWarnings gre ; keepAlive (greName gre) ; return OneInst { cir_new_theta = theta , cir_mk_ev = mk_ev |