---

yaml
---
r: 208346
b: refs/heads/snap-stage3
c: db9d018
h: refs/heads/master
v: v3

Author: tbelaire

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 372c69d8d293985ad3bffbe5c5e527dc37e90169
+refs/heads/snap-stage3: db9d01842450fe07f77ca97d9a68d105366f407e
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc_resolve/resolve_imports.rs

@@ -896,8 +896,6 @@ 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,12 +905,11 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                            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) {
-                    // item is syntax::ast::Item;
-                    span_note!(self.resolver.session, item.span,
-                               "previous import of `{}` here",
-                               token::get_name(name));
-                }
+                let item = self.resolver.ast_map.expect_item(use_id);
+                // item is syntax::ast::Item;
+                span_note!(self.resolver.session, item.span,
+                            "previous import of `{}` here",
+                            token::get_name(name));
             }
             Some(_) | None => {}
         }

branches/snap-stage3/src/test/compile-fail/double-import.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -10,6 +10,8 @@
 #![feature(no_std)]
 #![no_std]
 
+// This tests that conflicting imports shows both `use` lines
+// when reporting the error.
 
 mod sub1 {
     fn foo() {} // implementation 1