From 4da9694a558458fe2854bd7fe6a9922afb91d360 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Tue, 1 Dec 2015 08:13:41 +0000
Subject: [PATCH] Fixes #30089

---
 src/librustc_resolve/lib.rs             | 7 -------
 src/librustc_resolve/resolve_imports.rs | 9 ---------
 2 files changed, 16 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index b161d7f33307..361047df3e65 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1037,13 +1037,6 @@ impl NameBindings {
         }
     }
 
-    fn create_from_module(module: Rc<Module>) -> NameBindings {
-        NameBindings {
-            type_ns: NameBinding::create_from_module(module),
-            value_ns: NameBinding::new(),
-        }
-    }
-
     /// Creates a new module in this set of name bindings.
     fn define_module(&self, module: Rc<Module>, sp: Span) {
         self.type_ns.set(NsDef::create_from_module(module, Some(sp)));
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 4f67d6e2f7e7..460c851e13f2 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -853,15 +853,6 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
 
         }
 
-        // Add external module children from the containing module.
-        for (&name, module) in target_module.external_module_children.borrow().iter() {
-            self.merge_import_resolution(module_,
-                                         target_module.clone(),
-                                         import_directive,
-                                         name,
-                                         NameBindings::create_from_module(module.clone()));
-        }
-
         // Record the destination of this import
         if let Some(did) = target_module.def_id() {
             self.resolver.def_map.borrow_mut().insert(id,