.contains_key(&name) {
match import_resolution.type_target {
Some(ref target) if !target.shadowable => {
- self.session.span_err(import_span,
- "import conflicts with imported \
- crate in this module");
+ let msg = format!("import `{}` conflicts with imported \
+ crate in this module",
+ token::get_name(name).get());
+ self.session.span_err(import_span, msg.as_slice());
}
Some(_) | None => {}
}
match *name_bindings.value_def.borrow() {
None => {}
Some(ref value) => {
- self.session.span_err(import_span,
- "import conflicts with value \
- in this module");
+ let msg = format!("import `{}` conflicts with value \
+ in this module",
+ token::get_name(name).get());
+ self.session.span_err(import_span, msg.as_slice());
match value.value_span {
None => {}
Some(span) => {
match *name_bindings.type_def.borrow() {
None => {}
Some(ref ty) => {
- self.session.span_err(import_span,
- "import conflicts with type in \
- this module");
+ let msg = format!("import `{}` conflicts with type in \
+ this module",
+ token::get_name(name).get());
+ self.session.span_err(import_span, msg.as_slice());
match ty.type_span {
None => {}
Some(span) => {
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use std::slice as std; //~ ERROR import conflicts with imported crate
+use std::slice as std; //~ ERROR import `std` conflicts with imported crate
fn main() {
}
--- /dev/null
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::slice::Items;
+//~^ ERROR import `Items` conflicts with type in this module
+
+struct Items;
+
+fn main() {
+}
+