From 7a69ee0c4806d30bbda5cc0277f3d0f38c3266c8 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Fri, 18 Dec 2015 10:10:31 +0000 Subject: [PATCH] Revert PR #30324, fixing a bug in which a public glob import can make preceding imports public (fixes #30159). --- src/librustc_resolve/resolve_imports.rs | 3 --- src/test/compile-fail/shadowed-use-visibility.rs | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index 07f6a0f954990..50537a6b936e9 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -798,9 +798,6 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> { dest_import_resolution.is_public = is_public; self.add_export(module_, name, &dest_import_resolution); } - } else { - // FIXME #30159: This is required for backwards compatability. - dest_import_resolution.is_public |= is_public; } self.check_for_conflicts_between_imports_and_items(module_, diff --git a/src/test/compile-fail/shadowed-use-visibility.rs b/src/test/compile-fail/shadowed-use-visibility.rs index bfc6a4ec9b854..1bf7f3933849d 100644 --- a/src/test/compile-fail/shadowed-use-visibility.rs +++ b/src/test/compile-fail/shadowed-use-visibility.rs @@ -17,6 +17,10 @@ mod foo { mod bar { use foo::bar::f as g; //~ ERROR unresolved import + + use foo as f; + pub use foo::*; } +use bar::f::f; //~ ERROR unresolved import fn main() {}