---

yaml
---
r: 206742
b: refs/heads/beta
c: 5c05278
h: refs/heads/master
v: v3

Author: tbelaire

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 69a5c379dfbfdb17319eab061bef554845eca407
+refs/heads/beta: 5c05278fecf9b7d4ff64fe374fb5b4598908d064
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/librustc_resolve/resolve_imports.rs

@@ -897,6 +897,7 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
         match target {
             Some(ref target) if target.shadowable != Shadowable::Always => {
                 use syntax::ast_map::NodeItem;
+
                 let ns_word = match namespace {
                     TypeNS => "type",
                     ValueNS => "value",
@@ -907,19 +908,10 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                                   &token::get_name(name));
                 let use_id = import_resolution.id(namespace);
                 if let NodeItem(item) = self.resolver.ast_map.get(use_id) {
-                    // Assert item.node is ItemUse
-                    // I feel like this should maybe mention the type,
-                    // as it's otherwise a bit of work to look up...
-                    // use syntax::ast::Item;
+                    // item is syntax::ast::Item;
                     span_note!(self.resolver.session, item.span,
-                               "Previously import of {} `{}` here",
-                               ns_word, token::get_name(name));
-                }
-                // Also showing the definition is reasonable?
-                if let Some(sp) = target.bindings.span_for_namespace(namespace) {
-                    span_note!(self.resolver.session, sp,
-                               "definition of {} `{}` here",
-                               ns_word, token::get_name(name));
+                               "previous import of `{}` here",
+                               token::get_name(name));
                 }
             }
             Some(_) | None => {}

branches/beta/src/test/compile-fail/double-import.rs

@@ -12,14 +12,14 @@
 
 
 mod sub1 {
-    fn foo() {} // Implementation 1
+    fn foo() {} // implementation 1
 }
 
 mod sub2 {
-    fn foo() {} // Implementation 2
+    fn foo() {} // implementation 2
 }
 
-use sub1::foo; //~ NOTE first imported here
-use sub2::foo; //~ ERROR a value named `foo` has already been imported in this module [E0252]
+use sub1::foo; //~ note previous import of `foo` here
+use sub2::foo; //~ error a value named `foo` has already been imported in this module [e0252]
 
 fn main() {}