diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-11-01 22:01:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 22:01:35 +0530 |
| commit | 9f603feaeeb8f48c80fedc0128a55d0fff23a718 (patch) | |
| tree | ae1dbaabe57dbc27966bfbffd9fc6bb576335b70 /compiler/rustc_resolve/src/lib.rs | |
| parent | e70cbef0c5db81079f4b5643380d6047ccd34a10 (diff) | |
| parent | 7d82cadd97acc66993b69304c5a1a04ef7d1fa36 (diff) | |
| download | rust-9f603feaeeb8f48c80fedc0128a55d0fff23a718.tar.gz rust-9f603feaeeb8f48c80fedc0128a55d0fff23a718.zip | |
Rollup merge of #84022 - Aaron1011:remove-derive-res-fallback, r=petrochenkov
Make PROC_MACRO_DERIVE_RESOLUTION_FALLBACK a hard error r? `@ghost`
Diffstat (limited to 'compiler/rustc_resolve/src/lib.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index 11b70a38da5..cd85ffd0982 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -104,9 +104,7 @@ enum Scope<'a> { DeriveHelpersCompat, MacroRules(MacroRulesScopeRef<'a>), CrateRoot, - // The node ID is for reporting the `PROC_MACRO_DERIVE_RESOLUTION_FALLBACK` - // lint if it should be reported. - Module(Module<'a>, Option<NodeId>), + Module(Module<'a>), MacroUsePrelude, BuiltinAttrs, ExternPrelude, @@ -1551,7 +1549,7 @@ impl<'a> Resolver<'a> { self.visit_scopes(ScopeSet::All(TypeNS, false), parent_scope, ctxt, |this, scope, _, _| { match scope { - Scope::Module(module, _) => { + Scope::Module(module) => { this.traits_in_module(module, assoc_item, &mut found_traits); } Scope::StdLibPrelude => { |