Skip to content

Commit 5d2ec9e

Browse files
committed
Finish fixing rust-lang#30159. This reverts PR rust-lang#30294.
1 parent 69e1f57 commit 5d2ec9e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/librustc_resolve/resolve_imports.rs

-3
Original file line numberDiff line numberDiff line change
@@ -923,9 +923,6 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
923923
is_public: is_public
924924
};
925925
}
926-
} else {
927-
// FIXME #30159: This is required for backwards compatability.
928-
dest_import_resolution[namespace].is_public |= is_public;
929926
}
930927
};
931928
merge_child_item(ValueNS);

src/test/compile-fail/shadowed-use-visibility.rs

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ mod foo {
1717

1818
mod bar {
1919
use foo::bar::f as g; //~ ERROR unresolved import
20+
21+
use foo as f;
22+
pub use foo::*;
2023
}
2124

25+
use bar::f::f; //~ ERROR unresolved import
2226
fn main() {}

0 commit comments

Comments
 (0)