---

yaml
---
r: 210629
b: refs/heads/try
c: 69a5c37
h: refs/heads/master
i:
  210627: b5a2992
v: v3

Author: tbelaire

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 168615f869ea560aa95e12a3c043c19110368be6
+refs/heads/try: 69a5c379dfbfdb17319eab061bef554845eca407
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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 => {}