Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-26 06:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename macro_use_import -> macro_use_imports

Browse source
This commit is contained in:
flip1995 2020-03-05 19:22:17 +01:00
parent 23d2b21297
commit 57393b5106
No known key found for this signature in database
GPG key ID: 2CEFCDB27ED0BE79
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1209,7 +1209,7 @@ Released 2018-09-13
[`linkedlist`]: https://rust-lang.github.io/rust-clippy/master/index.html#linkedlist [`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 [`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 [`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 [`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_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 [`manual_saturating_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_saturating_arithmetic

6
clippy_lints/src/lib.rs
View file

@ -600,7 +600,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
&loops::WHILE_IMMUTABLE_CONDITION, &loops::WHILE_IMMUTABLE_CONDITION,
&loops::WHILE_LET_LOOP, &loops::WHILE_LET_LOOP,
&loops::WHILE_LET_ON_ITERATOR, &loops::WHILE_LET_ON_ITERATOR,
&macro_use::MACRO_USE_IMPORT, &macro_use::MACRO_USE_IMPORTS,
&main_recursion::MAIN_RECURSION, &main_recursion::MAIN_RECURSION,
&map_clone::MAP_CLONE, &map_clone::MAP_CLONE,
&map_unit_fn::OPTION_MAP_UNIT_FN, &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(move || box excessive_bools::ExcessiveBools::new(max_struct_bools, max_fn_params_bools));
store.register_early_pass(|| box option_env_unwrap::OptionEnvUnwrap); store.register_early_pass(|| box option_env_unwrap::OptionEnvUnwrap);
store.register_late_pass(|| box wildcard_imports::WildcardImports); 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![ store.register_group(true, "clippy::restriction", Some("clippy_restriction"), vec![
LintId::of(&arithmetic::FLOAT_ARITHMETIC), 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(&literal_representation::LARGE_DIGIT_GROUPS),
LintId::of(&loops::EXPLICIT_INTO_ITER_LOOP), LintId::of(&loops::EXPLICIT_INTO_ITER_LOOP),
LintId::of(&loops::EXPLICIT_ITER_LOOP), LintId::of(&loops::EXPLICIT_ITER_LOOP),
LintId::of(&macro_use::MACRO_USE_IMPORT), LintId::of(&macro_use::MACRO_USE_IMPORTS),
LintId::of(&matches::SINGLE_MATCH_ELSE), LintId::of(&matches::SINGLE_MATCH_ELSE),
LintId::of(&methods::FILTER_MAP), LintId::of(&methods::FILTER_MAP),
LintId::of(&methods::FILTER_MAP_NEXT), LintId::of(&methods::FILTER_MAP_NEXT),

8
clippy_lints/src/macro_use.rs
View file

@ -19,14 +19,14 @@ declare_clippy_lint! {
/// #[macro_use] /// #[macro_use]
/// use lazy_static; /// use lazy_static;
/// ``` /// ```
pub MACRO_USE_IMPORT, pub MACRO_USE_IMPORTS,
pedantic, pedantic,
"#[macro_use] is no longer needed" "#[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) { fn check_item(&mut self, ecx: &EarlyContext<'_>, item: &ast::Item) {
if_chain! { if_chain! {
if ecx.sess.opts.edition == Edition::Edition2018; if ecx.sess.opts.edition == Edition::Edition2018;
@ -40,7 +40,7 @@ impl EarlyLintPass for MacroUseImport {
let help = format!("use {}::<macro name>", snippet(ecx, use_tree.span, "_")); let help = format!("use {}::<macro name>", snippet(ecx, use_tree.span, "_"));
span_lint_and_sugg( span_lint_and_sugg(
ecx, ecx,
MACRO_USE_IMPORT, MACRO_USE_IMPORTS,
mac_attr.span, mac_attr.span,
msg, msg,
"remove the attribute and import the macro directly, try", "remove the attribute and import the macro directly, try",

2
src/lintlist/mod.rs
View file

@ -1016,7 +1016,7 @@ pub const ALL_LINTS: [Lint; 360] = [
module: "float_literal", module: "float_literal",
}, },
Lint { Lint {
name: "macro_use_import", name: "macro_use_imports",
group: "pedantic", group: "pedantic",
desc: "#[macro_use] is no longer needed", desc: "#[macro_use] is no longer needed",
deprecation: None, deprecation: None,

2
tests/ui/macro_use_import.rs → tests/ui/macro_use_imports.rs
View file

@ -1,5 +1,5 @@
// compile-flags: --edition 2018 // compile-flags: --edition 2018
#![warn(clippy::macro_use_import)] #![warn(clippy::macro_use_imports)]
use std::collections::HashMap; use std::collections::HashMap;
#[macro_use] #[macro_use]

4
tests/ui/macro_use_import.stderr → tests/ui/macro_use_imports.stderr
View file

@ -1,10 +1,10 @@
error: `macro_use` attributes are no longer needed in the Rust 2018 edition 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] LL | #[macro_use]
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use std::prelude::<macro name>` | ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use std::prelude::<macro name>`
| |
= 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 error: aborting due to previous error