Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions compiler/rustc_resolve/src/check_unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@ impl Resolver<'_, '_> {

let remove_whole_use = remove_spans.len() == 1 && remove_spans[0] == unused.item_span;
let num_to_remove = ms.primary_spans().len();
// Only offer rustfix suggestions for spans that point at directly editable code.
let can_suggest_removal =
remove_spans.iter().all(|span| span.can_be_used_for_suggestions());

// If we are in the `--test` mode, suppress a help that adds the `#[cfg(test)]`
// attribute; however, if not, suggest adding the attribute. There is no way to
Expand Down Expand Up @@ -516,11 +519,13 @@ impl Resolver<'_, '_> {
unused.use_tree_id,
ms,
move |dcx, level, sess| {
let sugg = if remove_whole_use {
errors::UnusedImportsSugg::RemoveWholeUse { span: remove_spans[0] }
} else {
errors::UnusedImportsSugg::RemoveImports { remove_spans, num_to_remove }
};
let sugg = can_suggest_removal.then(|| {
if remove_whole_use {
errors::UnusedImportsSugg::RemoveWholeUse { span: remove_spans[0] }
} else {
errors::UnusedImportsSugg::RemoveImports { remove_spans, num_to_remove }
}
});
let test_module_span = test_module_span.map(|span| {
sess.downcast_ref::<rustc_session::Session>()
.expect("expected a `Session`")
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,7 @@ pub(crate) struct ElidedLifetimesInPaths {
)]
pub(crate) struct UnusedImports {
#[subdiagnostic]
pub sugg: UnusedImportsSugg,
pub sugg: Option<UnusedImportsSugg>,
#[help("if this is a test module, consider adding a `#[cfg(test)]` to the containing module")]
pub test_module_span: Option<Span>,

Expand Down
23 changes: 23 additions & 0 deletions tests/ui/imports/unused-import-in-macro-expansion-rustfix.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Regression test for <https://github.com/rust-lang/rust/issues/147855>
//@ edition:2021
//@ run-rustfix
//@ rustfix-only-machine-applicable
//@ check-pass

mod m {
macro_rules! define_new_macro {
($name:ident) => {
macro_rules! $name {
() => {};
}
pub(crate) use $name;
};
}

define_new_macro!(item_used);
define_new_macro!(item_unused);
}

fn main() {
m::item_used!();
}
23 changes: 23 additions & 0 deletions tests/ui/imports/unused-import-in-macro-expansion-rustfix.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Regression test for <https://github.com/rust-lang/rust/issues/147855>
//@ edition:2021
//@ run-rustfix
//@ rustfix-only-machine-applicable
//@ check-pass

mod m {
macro_rules! define_new_macro {
($name:ident) => {
macro_rules! $name {
() => {};
}
pub(crate) use $name;
};
}

define_new_macro!(item_used);
define_new_macro!(item_unused);
}

fn main() {
m::item_used!();
}
Loading