Skip to content

Commit 4209f94

Browse files
committed
Add label to E0254
This issue #35513 is a part of #35233. r? @jonathandturner
1 parent 1f2ae38 commit 4209f94

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/librustc_resolve/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3370,8 +3370,11 @@ impl<'a> Resolver<'a> {
33703370

33713371
let mut err = match (old_binding.is_extern_crate(), binding.is_extern_crate()) {
33723372
(true, true) => struct_span_err!(self.session, span, E0259, "{}", msg),
3373-
(true, _) | (_, true) if binding.is_import() || old_binding.is_import() =>
3374-
struct_span_err!(self.session, span, E0254, "{}", msg),
3373+
(true, _) | (_, true) if binding.is_import() || old_binding.is_import() => {
3374+
let mut e = struct_span_err!(self.session, span, E0254, "{}", msg);
3375+
e.span_label(span, &"already imported");
3376+
e
3377+
},
33753378
(true, _) | (_, true) => struct_span_err!(self.session, span, E0260, "{}", msg),
33763379
_ => match (old_binding.is_import(), binding.is_import()) {
33773380
(false, false) => struct_span_err!(self.session, span, E0428, "{}", msg),

src/test/compile-fail/E0254.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
// except according to those terms.
1010

1111
extern crate collections;
12+
//~^ NOTE previous import of `collections` here
1213

1314
mod foo {
1415
pub trait collections {
1516
fn do_something();
1617
}
1718
}
1819

19-
use foo::collections; //~ ERROR E0254
20+
use foo::collections;
21+
//~^ ERROR E0254
22+
//~| NOTE already imported
2023

2124
fn main() {}

0 commit comments

Comments
 (0)