Skip to content

Commit

Permalink
Rollup merge of #132453 - Urgau:non_local_defs-impl-mod-transparent, …
Browse files Browse the repository at this point in the history
…r=jieyouxu

Also treat `impl` definition parent as transparent regarding modules

This PR changes the `non_local_definitions` lint logic to also consider `impl` definition parent as transparent regarding modules.

See tests and explanation in the changes.

``````@rustbot`````` label +L-non_local_definitions
Fixes *(after beta-backport)* #132427
cc ``````@leighmcculloch``````
r? ``````@jieyouxu``````
  • Loading branch information
matthiaskrgr authored Nov 2, 2024
2 parents e5269bb + 37db365 commit fa69b67
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 2 deletions.
10 changes: 8 additions & 2 deletions compiler/rustc_lint/src/non_local_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,15 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
// };
// };
// ```
//
// It isn't possible to mix a impl in a module with const-anon, but an item can
// be put inside a module and referenced by a impl so we also have to treat the
// item parent as transparent to module and for consistency we have to do the same
// for impl, otherwise the item-def and impl-def won't have the same parent.
let outermost_impl_parent = peel_parent_while(cx.tcx, parent, |tcx, did| {
tcx.def_kind(did) == DefKind::Const
&& tcx.opt_item_name(did) == Some(kw::Underscore)
tcx.def_kind(did) == DefKind::Mod
|| (tcx.def_kind(did) == DefKind::Const
&& tcx.opt_item_name(did) == Some(kw::Underscore))
});

// 2. We check if any of the paths reference a the `impl`-parent.
Expand Down
64 changes: 64 additions & 0 deletions tests/ui/lint/non-local-defs/convoluted-locals-132427.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Regression tests for https://github.com/rust-lang/rust/issues/132427

//@ check-pass

// original
mod auth {
const _: () = {
pub enum ArbitraryContext {}

const _: () = {
impl ArbitraryContext {}
};
};
}

mod z {
pub enum ArbitraryContext {}

const _: () = {
const _: () = {
impl ArbitraryContext {}
};
};
}

const _: () = {
mod auth {
const _: () = {
pub enum ArbitraryContext {}

const _: () = {
impl ArbitraryContext {}
};
};
}
};

mod a {
mod b {
const _: () = {
pub enum ArbitraryContext {}

const _: () = {
impl ArbitraryContext {}
};
};
}
}

mod foo {
const _: () = {
mod auth {
const _: () = {
pub enum ArbitraryContext {}

const _: () = {
impl ArbitraryContext {}
};
};
}
};
}

fn main() {}

0 comments on commit fa69b67

Please sign in to comment.