From 57393b5106c5475dbe9f99f75013e8ea7f1988d6 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Thu, 5 Mar 2020 19:22:17 +0100 Subject: [PATCH] Rename macro_use_import -> macro_use_imports --- CHANGELOG.md | 2 +- clippy_lints/src/lib.rs | 6 +++--- clippy_lints/src/macro_use.rs | 8 ++++---- src/lintlist/mod.rs | 2 +- tests/ui/{macro_use_import.rs => macro_use_imports.rs} | 2 +- .../{macro_use_import.stderr => macro_use_imports.stderr} | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename tests/ui/{macro_use_import.rs => macro_use_imports.rs} (82%) rename tests/ui/{macro_use_import.stderr => macro_use_imports.stderr} (71%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba9fdd4b8a..c3f291bc046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1209,7 +1209,7 @@ Released 2018-09-13 [`linkedlist`]: https://rust-lang.github.io/rust-clippy/master/index.html#linkedlist [`logic_bug`]: https://rust-lang.github.io/rust-clippy/master/index.html#logic_bug [`lossy_float_literal`]: https://rust-lang.github.io/rust-clippy/master/index.html#lossy_float_literal -[`macro_use_import`]: https://rust-lang.github.io/rust-clippy/master/index.html#macro_use_import +[`macro_use_imports`]: https://rust-lang.github.io/rust-clippy/master/index.html#macro_use_imports [`main_recursion`]: https://rust-lang.github.io/rust-clippy/master/index.html#main_recursion [`manual_memcpy`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_memcpy [`manual_saturating_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_saturating_arithmetic diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 86ab7d83905..02c016c385d 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -600,7 +600,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: &loops::WHILE_IMMUTABLE_CONDITION, &loops::WHILE_LET_LOOP, &loops::WHILE_LET_ON_ITERATOR, - ¯o_use::MACRO_USE_IMPORT, + ¯o_use::MACRO_USE_IMPORTS, &main_recursion::MAIN_RECURSION, &map_clone::MAP_CLONE, &map_unit_fn::OPTION_MAP_UNIT_FN, @@ -1014,7 +1014,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: store.register_early_pass(move || box excessive_bools::ExcessiveBools::new(max_struct_bools, max_fn_params_bools)); store.register_early_pass(|| box option_env_unwrap::OptionEnvUnwrap); store.register_late_pass(|| box wildcard_imports::WildcardImports); - store.register_early_pass(|| box macro_use::MacroUseImport); + store.register_early_pass(|| box macro_use::MacroUseImports); store.register_group(true, "clippy::restriction", Some("clippy_restriction"), vec![ LintId::of(&arithmetic::FLOAT_ARITHMETIC), @@ -1082,7 +1082,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&literal_representation::LARGE_DIGIT_GROUPS), LintId::of(&loops::EXPLICIT_INTO_ITER_LOOP), LintId::of(&loops::EXPLICIT_ITER_LOOP), - LintId::of(¯o_use::MACRO_USE_IMPORT), + LintId::of(¯o_use::MACRO_USE_IMPORTS), LintId::of(&matches::SINGLE_MATCH_ELSE), LintId::of(&methods::FILTER_MAP), LintId::of(&methods::FILTER_MAP_NEXT), diff --git a/clippy_lints/src/macro_use.rs b/clippy_lints/src/macro_use.rs index 43671d69413..b1345d0b751 100644 --- a/clippy_lints/src/macro_use.rs +++ b/clippy_lints/src/macro_use.rs @@ -19,14 +19,14 @@ declare_clippy_lint! { /// #[macro_use] /// use lazy_static; /// ``` - pub MACRO_USE_IMPORT, + pub MACRO_USE_IMPORTS, pedantic, "#[macro_use] is no longer needed" } -declare_lint_pass!(MacroUseImport => [MACRO_USE_IMPORT]); +declare_lint_pass!(MacroUseImports => [MACRO_USE_IMPORTS]); -impl EarlyLintPass for MacroUseImport { +impl EarlyLintPass for MacroUseImports { fn check_item(&mut self, ecx: &EarlyContext<'_>, item: &ast::Item) { if_chain! { if ecx.sess.opts.edition == Edition::Edition2018; @@ -40,7 +40,7 @@ impl EarlyLintPass for MacroUseImport { let help = format!("use {}::", snippet(ecx, use_tree.span, "_")); span_lint_and_sugg( ecx, - MACRO_USE_IMPORT, + MACRO_USE_IMPORTS, mac_attr.span, msg, "remove the attribute and import the macro directly, try", diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index 1635ff7babd..4ae4ccc91f0 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -1016,7 +1016,7 @@ pub const ALL_LINTS: [Lint; 360] = [ module: "float_literal", }, Lint { - name: "macro_use_import", + name: "macro_use_imports", group: "pedantic", desc: "#[macro_use] is no longer needed", deprecation: None, diff --git a/tests/ui/macro_use_import.rs b/tests/ui/macro_use_imports.rs similarity index 82% rename from tests/ui/macro_use_import.rs rename to tests/ui/macro_use_imports.rs index 33ce2b524ef..094dce17d4b 100644 --- a/tests/ui/macro_use_import.rs +++ b/tests/ui/macro_use_imports.rs @@ -1,5 +1,5 @@ // compile-flags: --edition 2018 -#![warn(clippy::macro_use_import)] +#![warn(clippy::macro_use_imports)] use std::collections::HashMap; #[macro_use] diff --git a/tests/ui/macro_use_import.stderr b/tests/ui/macro_use_imports.stderr similarity index 71% rename from tests/ui/macro_use_import.stderr rename to tests/ui/macro_use_imports.stderr index 1d86ba58441..b5e3dbec572 100644 --- a/tests/ui/macro_use_import.stderr +++ b/tests/ui/macro_use_imports.stderr @@ -1,10 +1,10 @@ error: `macro_use` attributes are no longer needed in the Rust 2018 edition - --> $DIR/macro_use_import.rs:5:1 + --> $DIR/macro_use_imports.rs:5:1 | LL | #[macro_use] | ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use std::prelude::` | - = note: `-D clippy::macro-use-import` implied by `-D warnings` + = note: `-D clippy::macro-use-imports` implied by `-D warnings` error: aborting due to previous error