Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider inner modules to be local in the non_local_definitions lint #124539

Merged
merged 1 commit into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions compiler/rustc_lint/src/non_local_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,16 +356,22 @@ fn path_has_local_parent(
}

/// Given a def id and a parent impl def id, this checks if the parent
/// def id correspond to the def id of the parent impl definition.
/// def id (modulo modules) correspond to the def id of the parent impl definition.
#[inline]
fn did_has_local_parent(
did: DefId,
tcx: TyCtxt<'_>,
impl_parent: DefId,
impl_parent_parent: Option<DefId>,
) -> bool {
did.is_local() && {
let res_parent = tcx.parent(did);
res_parent == impl_parent || Some(res_parent) == impl_parent_parent
}
did.is_local()
&& if let Some(did_parent) = tcx.opt_parent(did) {
did_parent == impl_parent
|| Some(did_parent) == impl_parent_parent
|| !did_parent.is_crate_root()
&& tcx.def_kind(did_parent) == DefKind::Mod
&& did_has_local_parent(did_parent, tcx, impl_parent, impl_parent_parent)
} else {
false
}
}
38 changes: 38 additions & 0 deletions tests/ui/lint/non-local-defs/module_as_local.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//! This test checks that module are treated as if they were local
//!
//! https://github.com/rust-lang/rust/issues/124396

//@ check-pass

trait JoinTo {}

fn simple_one() {
mod posts {
#[allow(non_camel_case_types)]
pub struct table {}
}

impl JoinTo for posts::table {}
}

fn simple_two() {
mod posts {
pub mod posts {
#[allow(non_camel_case_types)]
pub struct table {}
}
}

impl JoinTo for posts::posts::table {}
}

struct Global;
fn trait_() {
mod posts {
pub trait AdjecentTo {}
}

impl posts::AdjecentTo for Global {}
}

fn main() {}
Loading