diff options
| -rw-r--r-- | src/librustc_resolve/lib.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/E0260.rs | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 6a4a48377c7..9d0c93f3e9d 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3354,7 +3354,11 @@ impl<'a> Resolver<'a> { e.span_label(span, &"already imported"); e }, - (true, _) | (_, true) => struct_span_err!(self.session, span, E0260, "{}", msg), + (true, _) | (_, true) => { + let mut e = struct_span_err!(self.session, span, E0260, "{}", msg); + e.span_label(span, &format!("`{}` already imported", name)); + e + }, _ => match (old_binding.is_import(), binding.is_import()) { (false, false) => { let mut e = struct_span_err!(self.session, span, E0428, "{}", msg); diff --git a/src/test/compile-fail/E0260.rs b/src/test/compile-fail/E0260.rs index d20829bf4d4..63647cb4103 100644 --- a/src/test/compile-fail/E0260.rs +++ b/src/test/compile-fail/E0260.rs @@ -9,8 +9,11 @@ // except according to those terms. extern crate collections; +//~^ NOTE previous import of `collections` here -mod collections { //~ ERROR E0260 +mod collections { +//~^ ERROR `collections` has already been imported in this module [E0260] +//~| NOTE `collections` already imported pub trait MyTrait { fn do_something(); } |