Refactor away define

diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 226b6559e68e9a91e1b0a68484326ff506e2e8c6..4e6ea6e5259f32671c52ac333841bc18ce17dc9f 100644 (file)
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -502,7 +502,11 @@ fn resolve_import(&mut self,
                     None
                 };
 
-                self.define(module_, target, ns, directive.import(binding, privacy_error));
+                let imported_binding = directive.import(binding, privacy_error);
+                let conflict = module_.try_define_child(target, ns, imported_binding);
+                if let Err(old_binding) = conflict {
+                    self.report_conflict(target, ns, &directive.import(binding, None), old_binding);
+                }
             }
             module_.decrement_outstanding_references_for(target, ns);
         }
@@ -613,7 +617,7 @@ fn resolve_glob_import(&mut self,
         for (&(name, ns), resolution) in target_module.resolutions.borrow().iter() {
             if let Some(Success(binding)) = resolution.try_result() {
                 if binding.defined_with(DefModifiers::IMPORTABLE | DefModifiers::PUBLIC) {
-                    self.define(module_, name, ns, directive.import(binding, None));
+                    let _ = module_.try_define_child(name, ns, directive.import(binding, None));
                 }
             }
         }
@@ -631,16 +635,6 @@ fn resolve_glob_import(&mut self,
         return Success(());
     }
 
-    fn define(&mut self,
-              parent: Module<'b>,
-              name: Name,
-              ns: Namespace,
-              binding: NameBinding<'b>) {
-        if let Err(old_binding) = parent.try_define_child(name, ns, binding.clone()) {
-            self.report_conflict(name, ns, &binding, old_binding);
-        }
-    }
-
     fn report_conflict(&mut self,
                        name: Name,
                        ns: Namespace,