From 54e539121d7911933157519a80e8dd30219dc9e0 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Thu, 29 Jul 2021 12:10:18 +0200 Subject: [PATCH] Rename two lints to comply with our lint naming convention self_named_constructor -> self_named_constructors append_instead_of_extend -> extend_with_drain --- CHANGELOG.md | 4 ++-- clippy_lints/src/lib.rs | 16 ++++++++-------- ...instead_of_extend.rs => extend_with_drain.rs} | 4 ++-- clippy_lints/src/methods/mod.rs | 8 ++++---- ...constructor.rs => self_named_constructors.rs} | 8 ++++---- ...d_of_extend.fixed => extend_with_drain.fixed} | 2 +- ...instead_of_extend.rs => extend_with_drain.rs} | 2 +- ...of_extend.stderr => extend_with_drain.stderr} | 8 ++++---- tests/ui/needless_bool/fixable.fixed | 2 +- tests/ui/needless_bool/fixable.rs | 2 +- ...constructor.rs => self_named_constructors.rs} | 2 +- ...tor.stderr => self_named_constructors.stderr} | 4 ++-- tests/ui/unit_arg.rs | 2 +- tests/ui/use_self.fixed | 2 +- tests/ui/use_self.rs | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) rename clippy_lints/src/methods/{append_instead_of_extend.rs => extend_with_drain.rs} (95%) rename clippy_lints/src/{self_named_constructor.rs => self_named_constructors.rs} (92%) rename tests/ui/{append_instead_of_extend.fixed => extend_with_drain.fixed} (96%) rename tests/ui/{append_instead_of_extend.rs => extend_with_drain.rs} (96%) rename tests/ui/{append_instead_of_extend.stderr => extend_with_drain.stderr} (77%) rename tests/ui/{self_named_constructor.rs => self_named_constructors.rs} (96%) rename tests/ui/{self_named_constructor.stderr => self_named_constructors.stderr} (65%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e00dec2e77..acbefc8064d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2423,7 +2423,6 @@ Released 2018-09-13 [`absurd_extreme_comparisons`]: https://rust-lang.github.io/rust-clippy/master/index.html#absurd_extreme_comparisons [`almost_swapped`]: https://rust-lang.github.io/rust-clippy/master/index.html#almost_swapped -[`append_instead_of_extend`]: https://rust-lang.github.io/rust-clippy/master/index.html#append_instead_of_extend [`approx_constant`]: https://rust-lang.github.io/rust-clippy/master/index.html#approx_constant [`as_conversions`]: https://rust-lang.github.io/rust-clippy/master/index.html#as_conversions [`assertions_on_constants`]: https://rust-lang.github.io/rust-clippy/master/index.html#assertions_on_constants @@ -2522,6 +2521,7 @@ Released 2018-09-13 [`explicit_iter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_iter_loop [`explicit_write`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_write [`extend_from_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#extend_from_slice +[`extend_with_drain`]: https://rust-lang.github.io/rust-clippy/master/index.html#extend_with_drain [`extra_unused_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#extra_unused_lifetimes [`fallible_impl_from`]: https://rust-lang.github.io/rust-clippy/master/index.html#fallible_impl_from [`field_reassign_with_default`]: https://rust-lang.github.io/rust-clippy/master/index.html#field_reassign_with_default @@ -2772,7 +2772,7 @@ Released 2018-09-13 [`same_item_push`]: https://rust-lang.github.io/rust-clippy/master/index.html#same_item_push [`search_is_some`]: https://rust-lang.github.io/rust-clippy/master/index.html#search_is_some [`self_assignment`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_assignment -[`self_named_constructor`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_named_constructor +[`self_named_constructors`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_named_constructors [`semicolon_if_nothing_returned`]: https://rust-lang.github.io/rust-clippy/master/index.html#semicolon_if_nothing_returned [`serde_api_misuse`]: https://rust-lang.github.io/rust-clippy/master/index.html#serde_api_misuse [`shadow_reuse`]: https://rust-lang.github.io/rust-clippy/master/index.html#shadow_reuse diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 3cffb507f70..f49b382c5ea 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -329,7 +329,7 @@ macro_rules! declare_clippy_lint { mod repeat_once; mod returns; mod self_assignment; -mod self_named_constructor; +mod self_named_constructors; mod semicolon_if_nothing_returned; mod serde_api; mod shadow; @@ -740,7 +740,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: mem_replace::MEM_REPLACE_OPTION_WITH_NONE, mem_replace::MEM_REPLACE_WITH_DEFAULT, mem_replace::MEM_REPLACE_WITH_UNINIT, - methods::APPEND_INSTEAD_OF_EXTEND, methods::BIND_INSTEAD_OF_MAP, methods::BYTES_NTH, methods::CHARS_LAST_CMP, @@ -751,6 +750,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: methods::CLONE_ON_REF_PTR, methods::EXPECT_FUN_CALL, methods::EXPECT_USED, + methods::EXTEND_WITH_DRAIN, methods::FILETYPE_IS_FILE, methods::FILTER_MAP_IDENTITY, methods::FILTER_MAP_NEXT, @@ -900,7 +900,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: returns::LET_AND_RETURN, returns::NEEDLESS_RETURN, self_assignment::SELF_ASSIGNMENT, - self_named_constructor::SELF_NAMED_CONSTRUCTOR, + self_named_constructors::SELF_NAMED_CONSTRUCTORS, semicolon_if_nothing_returned::SEMICOLON_IF_NOTHING_RETURNED, serde_api::SERDE_API_MISUSE, shadow::SHADOW_REUSE, @@ -1296,7 +1296,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(mem_replace::MEM_REPLACE_OPTION_WITH_NONE), LintId::of(mem_replace::MEM_REPLACE_WITH_DEFAULT), LintId::of(mem_replace::MEM_REPLACE_WITH_UNINIT), - LintId::of(methods::APPEND_INSTEAD_OF_EXTEND), LintId::of(methods::BIND_INSTEAD_OF_MAP), LintId::of(methods::BYTES_NTH), LintId::of(methods::CHARS_LAST_CMP), @@ -1304,6 +1303,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(methods::CLONE_DOUBLE_REF), LintId::of(methods::CLONE_ON_COPY), LintId::of(methods::EXPECT_FUN_CALL), + LintId::of(methods::EXTEND_WITH_DRAIN), LintId::of(methods::FILTER_MAP_IDENTITY), LintId::of(methods::FILTER_NEXT), LintId::of(methods::FLAT_MAP_IDENTITY), @@ -1407,7 +1407,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(returns::LET_AND_RETURN), LintId::of(returns::NEEDLESS_RETURN), LintId::of(self_assignment::SELF_ASSIGNMENT), - LintId::of(self_named_constructor::SELF_NAMED_CONSTRUCTOR), + LintId::of(self_named_constructors::SELF_NAMED_CONSTRUCTORS), LintId::of(serde_api::SERDE_API_MISUSE), LintId::of(single_component_path_imports::SINGLE_COMPONENT_PATH_IMPORTS), LintId::of(size_of_in_element_count::SIZE_OF_IN_ELEMENT_COUNT), @@ -1561,7 +1561,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(redundant_static_lifetimes::REDUNDANT_STATIC_LIFETIMES), LintId::of(returns::LET_AND_RETURN), LintId::of(returns::NEEDLESS_RETURN), - LintId::of(self_named_constructor::SELF_NAMED_CONSTRUCTOR), + LintId::of(self_named_constructors::SELF_NAMED_CONSTRUCTORS), LintId::of(single_component_path_imports::SINGLE_COMPONENT_PATH_IMPORTS), LintId::of(tabs_in_doc_comments::TABS_IN_DOC_COMMENTS), LintId::of(to_digit_is_some::TO_DIGIT_IS_SOME), @@ -1762,8 +1762,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(large_enum_variant::LARGE_ENUM_VARIANT), LintId::of(loops::MANUAL_MEMCPY), LintId::of(loops::NEEDLESS_COLLECT), - LintId::of(methods::APPEND_INSTEAD_OF_EXTEND), LintId::of(methods::EXPECT_FUN_CALL), + LintId::of(methods::EXTEND_WITH_DRAIN), LintId::of(methods::ITER_NTH), LintId::of(methods::MANUAL_STR_REPEAT), LintId::of(methods::OR_FUN_CALL), @@ -2104,7 +2104,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: let scripts = conf.allowed_scripts.clone(); store.register_early_pass(move || box disallowed_script_idents::DisallowedScriptIdents::new(&scripts)); store.register_late_pass(|| box strlen_on_c_strings::StrlenOnCStrings); - store.register_late_pass(move || box self_named_constructor::SelfNamedConstructor); + store.register_late_pass(move || box self_named_constructors::SelfNamedConstructors); } #[rustfmt::skip] diff --git a/clippy_lints/src/methods/append_instead_of_extend.rs b/clippy_lints/src/methods/extend_with_drain.rs similarity index 95% rename from clippy_lints/src/methods/append_instead_of_extend.rs rename to clippy_lints/src/methods/extend_with_drain.rs index e39a5a1efd1..57e10ce42f8 100644 --- a/clippy_lints/src/methods/append_instead_of_extend.rs +++ b/clippy_lints/src/methods/extend_with_drain.rs @@ -7,7 +7,7 @@ use rustc_lint::LateContext; use rustc_span::symbol::sym; -use super::APPEND_INSTEAD_OF_EXTEND; +use super::EXTEND_WITH_DRAIN; pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, arg: &Expr<'_>) { let ty = cx.typeck_results().expr_ty(recv).peel_refs(); @@ -25,7 +25,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, arg: let mut applicability = Applicability::MachineApplicable; span_lint_and_sugg( cx, - APPEND_INSTEAD_OF_EXTEND, + EXTEND_WITH_DRAIN, expr.span, "use of `extend` instead of `append` for adding the full range of a second vector", "try this", diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index d3e12023814..5aa29424349 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -1,4 +1,3 @@ -mod append_instead_of_extend; mod bind_instead_of_map; mod bytes_nth; mod chars_cmp; @@ -12,6 +11,7 @@ mod cloned_instead_of_copied; mod expect_fun_call; mod expect_used; +mod extend_with_drain; mod filetype_is_file; mod filter_map; mod filter_map_identity; @@ -1068,7 +1068,7 @@ /// // Good /// a.append(&mut b); /// ``` - pub APPEND_INSTEAD_OF_EXTEND, + pub EXTEND_WITH_DRAIN, perf, "using vec.append(&mut vec) to move the full range of a vecor to another" } @@ -1821,7 +1821,7 @@ pub fn new(avoid_breaking_exported_api: bool, msrv: Option) -> Sel IMPLICIT_CLONE, SUSPICIOUS_SPLITN, MANUAL_STR_REPEAT, - APPEND_INSTEAD_OF_EXTEND + EXTEND_WITH_DRAIN ]); /// Extracts a method call name, args, and `Span` of the method name. @@ -2085,7 +2085,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio }, ("extend", [arg]) => { string_extend_chars::check(cx, expr, recv, arg); - append_instead_of_extend::check(cx, expr, recv, arg); + extend_with_drain::check(cx, expr, recv, arg); }, ("filter_map", [arg]) => { unnecessary_filter_map::check(cx, expr, arg); diff --git a/clippy_lints/src/self_named_constructor.rs b/clippy_lints/src/self_named_constructors.rs similarity index 92% rename from clippy_lints/src/self_named_constructor.rs rename to clippy_lints/src/self_named_constructors.rs index 2123a14cc1b..4472edecbed 100644 --- a/clippy_lints/src/self_named_constructor.rs +++ b/clippy_lints/src/self_named_constructors.rs @@ -32,14 +32,14 @@ /// } /// } /// ``` - pub SELF_NAMED_CONSTRUCTOR, + pub SELF_NAMED_CONSTRUCTORS, style, "method should not have the same name as the type it is implemented for" } -declare_lint_pass!(SelfNamedConstructor => [SELF_NAMED_CONSTRUCTOR]); +declare_lint_pass!(SelfNamedConstructors => [SELF_NAMED_CONSTRUCTORS]); -impl<'tcx> LateLintPass<'tcx> for SelfNamedConstructor { +impl<'tcx> LateLintPass<'tcx> for SelfNamedConstructors { fn check_impl_item(&mut self, cx: &LateContext<'tcx>, impl_item: &'tcx ImplItem<'_>) { match impl_item.kind { ImplItemKind::Fn(ref sig, _) => { @@ -80,7 +80,7 @@ fn check_impl_item(&mut self, cx: &LateContext<'tcx>, impl_item: &'tcx ImplItem< then { span_lint( cx, - SELF_NAMED_CONSTRUCTOR, + SELF_NAMED_CONSTRUCTORS, impl_item.span, &format!("constructor `{}` has the same name as the type", impl_item.ident.name), ); diff --git a/tests/ui/append_instead_of_extend.fixed b/tests/ui/extend_with_drain.fixed similarity index 96% rename from tests/ui/append_instead_of_extend.fixed rename to tests/ui/extend_with_drain.fixed index 283358333cd..00170e649e2 100644 --- a/tests/ui/append_instead_of_extend.fixed +++ b/tests/ui/extend_with_drain.fixed @@ -1,5 +1,5 @@ // run-rustfix -#![warn(clippy::append_instead_of_extend)] +#![warn(clippy::extend_with_drain)] use std::collections::BinaryHeap; fn main() { //gets linted diff --git a/tests/ui/append_instead_of_extend.rs b/tests/ui/extend_with_drain.rs similarity index 96% rename from tests/ui/append_instead_of_extend.rs rename to tests/ui/extend_with_drain.rs index abde5cdac5c..d76458c3289 100644 --- a/tests/ui/append_instead_of_extend.rs +++ b/tests/ui/extend_with_drain.rs @@ -1,5 +1,5 @@ // run-rustfix -#![warn(clippy::append_instead_of_extend)] +#![warn(clippy::extend_with_drain)] use std::collections::BinaryHeap; fn main() { //gets linted diff --git a/tests/ui/append_instead_of_extend.stderr b/tests/ui/extend_with_drain.stderr similarity index 77% rename from tests/ui/append_instead_of_extend.stderr rename to tests/ui/extend_with_drain.stderr index 9d309d981de..57f344716a1 100644 --- a/tests/ui/append_instead_of_extend.stderr +++ b/tests/ui/extend_with_drain.stderr @@ -1,19 +1,19 @@ error: use of `extend` instead of `append` for adding the full range of a second vector - --> $DIR/append_instead_of_extend.rs:9:5 + --> $DIR/extend_with_drain.rs:9:5 | LL | vec2.extend(vec1.drain(..)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `vec2.append(&mut vec1)` | - = note: `-D clippy::append-instead-of-extend` implied by `-D warnings` + = note: `-D clippy::extend-with-drain` implied by `-D warnings` error: use of `extend` instead of `append` for adding the full range of a second vector - --> $DIR/append_instead_of_extend.rs:14:5 + --> $DIR/extend_with_drain.rs:14:5 | LL | vec4.extend(vec3.drain(..)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `vec4.append(&mut vec3)` error: use of `extend` instead of `append` for adding the full range of a second vector - --> $DIR/append_instead_of_extend.rs:18:5 + --> $DIR/extend_with_drain.rs:18:5 | LL | vec11.extend(return_vector().drain(..)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `vec11.append(&mut return_vector())` diff --git a/tests/ui/needless_bool/fixable.fixed b/tests/ui/needless_bool/fixable.fixed index 5917ffc3e12..639eac8b8b3 100644 --- a/tests/ui/needless_bool/fixable.fixed +++ b/tests/ui/needless_bool/fixable.fixed @@ -7,7 +7,7 @@ clippy::no_effect, clippy::if_same_then_else, clippy::needless_return, - clippy::self_named_constructor + clippy::self_named_constructors )] use std::cell::Cell; diff --git a/tests/ui/needless_bool/fixable.rs b/tests/ui/needless_bool/fixable.rs index d26dcb9fcc3..a3ce086a1c9 100644 --- a/tests/ui/needless_bool/fixable.rs +++ b/tests/ui/needless_bool/fixable.rs @@ -7,7 +7,7 @@ clippy::no_effect, clippy::if_same_then_else, clippy::needless_return, - clippy::self_named_constructor + clippy::self_named_constructors )] use std::cell::Cell; diff --git a/tests/ui/self_named_constructor.rs b/tests/ui/self_named_constructors.rs similarity index 96% rename from tests/ui/self_named_constructor.rs rename to tests/ui/self_named_constructors.rs index 7658b86a8d6..356f701c985 100644 --- a/tests/ui/self_named_constructor.rs +++ b/tests/ui/self_named_constructors.rs @@ -1,4 +1,4 @@ -#![warn(clippy::self_named_constructor)] +#![warn(clippy::self_named_constructors)] struct ShouldSpawn; struct ShouldNotSpawn; diff --git a/tests/ui/self_named_constructor.stderr b/tests/ui/self_named_constructors.stderr similarity index 65% rename from tests/ui/self_named_constructor.stderr rename to tests/ui/self_named_constructors.stderr index 1e2c34ac2f7..ba989f06dc8 100644 --- a/tests/ui/self_named_constructor.stderr +++ b/tests/ui/self_named_constructors.stderr @@ -1,12 +1,12 @@ error: constructor `should_spawn` has the same name as the type - --> $DIR/self_named_constructor.rs:7:5 + --> $DIR/self_named_constructors.rs:7:5 | LL | / pub fn should_spawn() -> ShouldSpawn { LL | | ShouldSpawn LL | | } | |_____^ | - = note: `-D clippy::self-named-constructor` implied by `-D warnings` + = note: `-D clippy::self-named-constructors` implied by `-D warnings` error: aborting due to previous error diff --git a/tests/ui/unit_arg.rs b/tests/ui/unit_arg.rs index df0fdaccb34..535683729f6 100644 --- a/tests/ui/unit_arg.rs +++ b/tests/ui/unit_arg.rs @@ -7,7 +7,7 @@ clippy::unnecessary_wraps, clippy::or_fun_call, clippy::needless_question_mark, - clippy::self_named_constructor + clippy::self_named_constructors )] use std::fmt::Debug; diff --git a/tests/ui/use_self.fixed b/tests/ui/use_self.fixed index 23fc7632511..dcf818f8076 100644 --- a/tests/ui/use_self.fixed +++ b/tests/ui/use_self.fixed @@ -8,7 +8,7 @@ clippy::should_implement_trait, clippy::upper_case_acronyms, clippy::from_over_into, - clippy::self_named_constructor + clippy::self_named_constructors )] #[macro_use] diff --git a/tests/ui/use_self.rs b/tests/ui/use_self.rs index bb46a339923..9da6fef7a38 100644 --- a/tests/ui/use_self.rs +++ b/tests/ui/use_self.rs @@ -8,7 +8,7 @@ clippy::should_implement_trait, clippy::upper_case_acronyms, clippy::from_over_into, - clippy::self_named_constructor + clippy::self_named_constructors )] #[macro_use]