bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixed some nits

Browse source
This commit is contained in:
Theo Belaire 2015-04-30 22:46:15 -04:00
parent 372c69d8d2
commit db9d018424
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_resolve/resolve_imports.rs
View file

@ -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 => {}
}

4
src/test/compile-fail/double-import.rs
View file

@ -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