bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131660 - Urgau:non_local_def-131643, r=jieyouxu

Browse source 
Also use outermost const-anon for impl items in `non_local_defs` lint

This PR update the logic for the impl paths (items) in the `non_local_definitions` lint to also consider const-anon in case the impl definition is wrapped inside const-anon it-self wrapped into a const-anon where the items are.

r? `@jieyouxu` *(since you interacted on the issue)*
Fixes *(after beta-backport)* #131643
This commit is contained in:
Matthias Krüger 2024-10-14 06:04:30 +02:00 • committed by GitHub
commit d34b9324c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_lint/src/non_local_def.rs
View file

@ -301,9 +301,13 @@ fn did_has_local_parent(
return false;
};
peel_parent_while(tcx, parent_did, |tcx, did| tcx.def_kind(did) == DefKind::Mod)
.map(|parent_did| parent_did == impl_parent || Some(parent_did) == outermost_impl_parent)
.unwrap_or(false)
peel_parent_while(tcx, parent_did, |tcx, did| {
tcx.def_kind(did) == DefKind::Mod
|| (tcx.def_kind(did) == DefKind::Const
&& tcx.opt_item_name(did) == Some(kw::Underscore))
})
.map(|parent_did| parent_did == impl_parent || Some(parent_did) == outermost_impl_parent)
.unwrap_or(false)
}
/// Given a `DefId` checks if it satisfies `f` if it does check with it's parent and continue