---

yaml
---
r: 166906
b: refs/heads/master
c: 35dd33c
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9a58808785499d730aaa0b1c914b34c204d2a487
+refs/heads/master: 35dd33c7e24798e8acc030fc5bbf2ca372616bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 023dfb0c898d851dee6ace2f8339b73b5287136b
 refs/heads/try: f5d619caf9f32458680fae55526b99582ca682dd

trunk/src/librustc_resolve/lib.rs

@@ -2866,6 +2866,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
                             // Continue.
                         }
                         Some(ref value_target) => {
+                            self.check_for_conflicting_import(&dest_import_resolution.value_target,
+                                                              import_directive.span,
+                                                              *ident,
+                                                              ValueNS);
                             dest_import_resolution.value_target = Some(value_target.clone());
                         }
                     }
@@ -2874,6 +2878,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
                             // Continue.
                         }
                         Some(ref type_target) => {
+                            self.check_for_conflicting_import(&dest_import_resolution.type_target,
+                                                              import_directive.span,
+                                                              *ident,
+                                                              TypeNS);
                             dest_import_resolution.type_target = Some(type_target.clone());
                         }
                     }