bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Revert "Make PROC_MACRO_DERIVE_RESOLUTION_FALLBACK a hard error"

Browse source 
This reverts commit 7d82cadd97.

I am doing this to buy us some time with respect to issue #106337 w.r.t. the
1.67 release.
This commit is contained in:
Felix S. Klock II 2023-01-20 17:13:55 -05:00
parent 5ce39f42bd
commit 5fa1347331
6 changed files with 243 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_resolve/src/lib.rs
View file

@ -105,7 +105,9 @@ enum Scope<'a> {
DeriveHelpersCompat,
MacroRules(MacroRulesScopeRef<'a>),
CrateRoot,
Module(Module<'a>),
// The node ID is for reporting the `PROC_MACRO_DERIVE_RESOLUTION_FALLBACK`
// lint if it should be reported.
Module(Module<'a>, Option<NodeId>),
MacroUsePrelude,
BuiltinAttrs,
ExternPrelude,
@ -1591,7 +1593,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 => {