Skip to content

Commit

Permalink
Fix regression from rust-lang#31461 and fix the test that was suppose…
Browse files Browse the repository at this point in the history
…d to catch it.
  • Loading branch information
jseyfried committed Feb 11, 2016
1 parent 1de70d3 commit 9189463
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/librustc_resolve/resolve_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
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 &&
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/no-extern-crate-in-glob-import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
extern crate core;

mod T {
use super::*;
pub use super::*;
}

fn main() {
Expand Down

0 comments on commit 9189463

Please sign in to comment.