Skip to content

Commit

Permalink
Rollup merge of rust-lang#59896 - estebank:dedup-spans, r=davidtwco
Browse files Browse the repository at this point in the history
Remove duplicated redundant spans

Fix rust-lang#59895.
  • Loading branch information
Centril authored Apr 14, 2019
2 parents 6c5777e + ca5a9ce commit 443925c
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/librustc_resolve/resolve_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1313,15 +1313,15 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
if !is_redundant.is_empty() &&
is_redundant.present_items().all(|is_redundant| is_redundant)
{
let mut redundant_spans: Vec<_> = redundant_span.present_items().collect();
redundant_spans.sort();
redundant_spans.dedup();
self.session.buffer_lint_with_diagnostic(
UNUSED_IMPORTS,
directive.id,
directive.span,
&format!("the item `{}` is imported redundantly", ident),
BuiltinLintDiagnostics::RedundantImport(
redundant_span.present_items().collect(),
ident,
),
BuiltinLintDiagnostics::RedundantImport(redundant_spans, ident),
);
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/issues/issue-59896.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#![deny(unused_imports)]

struct S;

fn main() {
use S; //~ ERROR the item `S` is imported redundantly

let _s = S;
}

17 changes: 17 additions & 0 deletions src/test/ui/issues/issue-59896.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
error: the item `S` is imported redundantly
--> $DIR/issue-59896.rs:6:9
|
LL | struct S;
| --------- the item `S` is already defined here
...
LL | use S;
| ^
|
note: lint level defined here
--> $DIR/issue-59896.rs:1:9
|
LL | #![deny(unused_imports)]
| ^^^^^^^^^^^^^^

error: aborting due to previous error

0 comments on commit 443925c

Please sign in to comment.