Skip to content

Commit ee7bb94

Browse files
committed
Auto merge of #56117 - petrochenkov:iempty, r=eddyb
resolve: Make "empty import canaries" invisible from other crates Empty imports `use prefix::{};` are desugared into `use prefix::{self as _};` to make sure the prefix is checked for privacy/stability/etc. This caused issues in cross-crate scenarios because gensyms are lost in crate metadata (the `_` is a gensym). Fixes #55811
2 parents 289ad6e + 1e4cf74 commit ee7bb94

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

src/librustc_resolve/resolve_imports.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,10 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
11631163
None => continue,
11641164
};
11651165

1166-
if binding.is_import() || binding.is_macro_def() {
1166+
// Filter away "empty import canaries".
1167+
let is_non_canary_import =
1168+
binding.is_import() && binding.vis != ty::Visibility::Invisible;
1169+
if is_non_canary_import || binding.is_macro_def() {
11671170
let def = binding.def();
11681171
if def != Def::Err {
11691172
if let Some(def_id) = def.opt_def_id() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mod m {}
2+
3+
// These two imports should not conflict when this crate is loaded from some other crate.
4+
use m::{};
5+
use m::{};

src/test/ui/imports/issue-55811.rs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// compile-pass
2+
// aux-build:issue-55811.rs
3+
4+
extern crate issue_55811;
5+
6+
fn main() {}

0 commit comments

Comments
 (0)