From 91894631d005e30f2cd7af23c0d5512a20148472 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Thu, 11 Feb 2016 07:18:41 +0000 Subject: [PATCH] Fix regression from #31461 and fix the test that was supposed to catch it. --- src/librustc_resolve/resolve_imports.rs | 1 + src/test/compile-fail/no-extern-crate-in-glob-import.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index 6667e489870..dc9692af1ea 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -524,6 +524,7 @@ fn resolve_glob_import(&mut self, build_reduced_graph::populate_module_if_necessary(self.resolver, target_module); target_module.for_each_child(|name, ns, binding| { if !binding.defined_with(DefModifiers::IMPORTABLE | DefModifiers::PUBLIC) { return } + if binding.is_extern_crate() { return } self.define(module_, name, ns, directive.import(binding)); if ns == TypeNS && directive.is_public && diff --git a/src/test/compile-fail/no-extern-crate-in-glob-import.rs b/src/test/compile-fail/no-extern-crate-in-glob-import.rs index 5d3efd85134..75882c5e981 100644 --- a/src/test/compile-fail/no-extern-crate-in-glob-import.rs +++ b/src/test/compile-fail/no-extern-crate-in-glob-import.rs @@ -14,7 +14,7 @@ extern crate core; mod T { - use super::*; + pub use super::*; } fn main() { -- 2.44.0