From 97a3ac5b86c21cc7e478da1c90187d006ea35eb0 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Thu, 22 Feb 2024 21:53:04 +0100 Subject: Allow unused_imports, and unused_import_braces on `use` --- clippy_lints/src/attrs.rs | 2 ++ tests/ui/useless_attribute.fixed | 8 ++++++++ tests/ui/useless_attribute.rs | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs index 340111edcf1..962870663e9 100644 --- a/clippy_lints/src/attrs.rs +++ b/clippy_lints/src/attrs.rs @@ -564,6 +564,8 @@ impl<'tcx> LateLintPass<'tcx> for Attributes { || is_word(lint, sym::deprecated) || is_word(lint, sym!(unreachable_pub)) || is_word(lint, sym!(unused)) + || is_word(lint, sym!(unused_import_braces)) + || is_word(lint, sym!(unused_imports)) || extract_clippy_lint(lint).map_or(false, |s| { matches!( s.as_str(), diff --git a/tests/ui/useless_attribute.fixed b/tests/ui/useless_attribute.fixed index c7d611f36cf..7f4874b1f20 100644 --- a/tests/ui/useless_attribute.fixed +++ b/tests/ui/useless_attribute.fixed @@ -80,6 +80,14 @@ pub mod split { #[allow(clippy::single_component_path_imports)] use regex; +mod module { + pub(crate) struct Struct; +} + +#[rustfmt::skip] +#[allow(unused_import_braces, unused_imports)] +use module::{Struct}; + fn main() { test_indented_attr(); } diff --git a/tests/ui/useless_attribute.rs b/tests/ui/useless_attribute.rs index 00cfa8f5d54..d0f22db727a 100644 --- a/tests/ui/useless_attribute.rs +++ b/tests/ui/useless_attribute.rs @@ -80,6 +80,14 @@ pub mod split { #[allow(clippy::single_component_path_imports)] use regex; +mod module { + pub(crate) struct Struct; +} + +#[rustfmt::skip] +#[allow(unused_import_braces, unused_imports)] +use module::{Struct}; + fn main() { test_indented_attr(); } -- cgit 1.4.1-3-g733a5 From f1974593c93f80707123e9f12a4d8a097bb367a5 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Thu, 22 Feb 2024 23:12:38 +0100 Subject: Remove double unused_imports check --- clippy_lints/src/attrs.rs | 1 - tests/ui/useless_attribute.fixed | 2 +- tests/ui/useless_attribute.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs index 962870663e9..f2937d51340 100644 --- a/clippy_lints/src/attrs.rs +++ b/clippy_lints/src/attrs.rs @@ -565,7 +565,6 @@ impl<'tcx> LateLintPass<'tcx> for Attributes { || is_word(lint, sym!(unreachable_pub)) || is_word(lint, sym!(unused)) || is_word(lint, sym!(unused_import_braces)) - || is_word(lint, sym!(unused_imports)) || extract_clippy_lint(lint).map_or(false, |s| { matches!( s.as_str(), diff --git a/tests/ui/useless_attribute.fixed b/tests/ui/useless_attribute.fixed index 7f4874b1f20..d1cdf73d559 100644 --- a/tests/ui/useless_attribute.fixed +++ b/tests/ui/useless_attribute.fixed @@ -85,7 +85,7 @@ mod module { } #[rustfmt::skip] -#[allow(unused_import_braces, unused_imports)] +#[allow(unused_import_braces)] use module::{Struct}; fn main() { diff --git a/tests/ui/useless_attribute.rs b/tests/ui/useless_attribute.rs index d0f22db727a..d6aa7fa242c 100644 --- a/tests/ui/useless_attribute.rs +++ b/tests/ui/useless_attribute.rs @@ -85,7 +85,7 @@ mod module { } #[rustfmt::skip] -#[allow(unused_import_braces, unused_imports)] +#[allow(unused_import_braces)] use module::{Struct}; fn main() { -- cgit 1.4.1-3-g733a5