---

yaml
---
r: 272811
b: refs/heads/beta
c: 51ca449
h: refs/heads/master
i:
  272809: d2ea7c1
  272807: c12e3b1

Author: jseyfried

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 20b99d303d0fb70c98d8c460324c8e1824fef482
+refs/heads/beta: 51ca449f74f5d35677ce58988354994299ab45dd
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_resolve/resolve_imports.rs

@@ -502,7 +502,11 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                     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 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
         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 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
         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,