Skip to content

Commit

Permalink
Auto merge of #87975 - m-ou-se:unused-import-attributes, r=nagisa
Browse files Browse the repository at this point in the history
Include attributes in removal span for unused imports.

Fixes #87973
  • Loading branch information
bors committed Aug 15, 2021
2 parents 40db258 + 8dc8649 commit dfe5fd0
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/check_unused.rs
Expand Up @@ -98,7 +98,7 @@ impl<'a, 'b> UnusedImportCheckVisitor<'a, 'b> {

impl<'a, 'b> Visitor<'a> for UnusedImportCheckVisitor<'a, 'b> {
fn visit_item(&mut self, item: &'a ast::Item) {
self.item_span = item.span;
self.item_span = item.span_with_attributes();

// Ignore is_public import statements because there's no way to be sure
// whether they're used or not. Also ignore imports with a dummy span
Expand Down
8 changes: 8 additions & 0 deletions src/test/ui/imports/unused-import-issue-87973.fixed
@@ -0,0 +1,8 @@
// run-rustfix
#![deny(unused_imports)]

// Check that attributes get removed too. See #87973.

//~^ ERROR unused import

fn main() {}
11 changes: 11 additions & 0 deletions src/test/ui/imports/unused-import-issue-87973.rs
@@ -0,0 +1,11 @@
// run-rustfix
#![deny(unused_imports)]

// Check that attributes get removed too. See #87973.
#[deprecated]
#[allow(unsafe_code)]
#[cfg(not(foo))]
use std::fs;
//~^ ERROR unused import

fn main() {}
14 changes: 14 additions & 0 deletions src/test/ui/imports/unused-import-issue-87973.stderr
@@ -0,0 +1,14 @@
error: unused import: `std::fs`
--> $DIR/unused-import-issue-87973.rs:8:5
|
LL | use std::fs;
| ^^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-import-issue-87973.rs:2:9
|
LL | #![deny(unused_imports)]
| ^^^^^^^^^^^^^^

error: aborting due to previous error

0 comments on commit dfe5fd0

Please sign in to comment.