---

yaml
---
r: 205039
b: refs/heads/tmp
c: 69a5c37
h: refs/heads/master
i:
  205037: 3af5aeb
  205035: 280dedd
  205031: e88ae98
  205023: 778c038
v: v3

Author: tbelaire

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: f0213d8ffb128a16f94af7ee985dc61484596163
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 168615f869ea560aa95e12a3c043c19110368be6
+refs/heads/tmp: 69a5c379dfbfdb17319eab061bef554845eca407
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f0ac7e04e647381e2bb87de1f3d0b108acb24d06
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/librustc_resolve/resolve_imports.rs

@@ -896,6 +896,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",
@@ -904,12 +905,21 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                           "a {} named `{}` has already been imported \
                            in this module", ns_word,
                                   &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;
+                    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,
-                               "first import of {} `{}` here",
+                               "definition of {} `{}` here",
                                ns_word, token::get_name(name));
-                } else {
-                    span_note!(self.resolver.session, import_span, "I can't find where it was previously imported");
                 }
             }
             Some(_) | None => {}