Auto merge of rust-lang#7504 - flip1995:rename-lints, r=flip1995

Rename two lints to comply with our lint naming convention self_named_constructor -> self_named_constructors append_instead_of_extend -> extend_with_drain We don't need to `register_renamed` those lints, since I'll backport them to beta, so the old names won't hit stable. changelog: none (I'll adapt the changelog before merging rust-lang#7498)
flip1995 · Jul 29, 2021 · 0cce3f6 · 0cce3f6
2 parents 766f09f + 54e5391
commit 0cce3f6
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2423,7 +2423,6 @@ Released 2018-09-13
 <!-- begin autogenerated links to lint list -->
 [`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
@@ -329,7 +329,7 @@ mod regex;
 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,14 +1296,14 @@ 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),
  LintId::of(methods::CHARS_NEXT_CMP),
  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/...s/src/methods/append_instead_of_extend.rs → ...py_lints/src/methods/extend_with_drain.rs b/...s/src/methods/append_instead_of_extend.rs → ...py_lints/src/methods/extend_with_drain.rs
@@ -7,7 +7,7 @@ use rustc_hir::{Expr, ExprKind, LangItem};
 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
@@ -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 clone_on_ref_ptr;
 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 @@ declare_clippy_lint! {
  /// // 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 @@ impl_lint_pass!(Methods => [
  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 → clippy_lints/src/self_named_constructors.rs b/clippy_lints/src/self_named_constructor.rs → clippy_lints/src/self_named_constructors.rs
@@ -32,14 +32,14 @@ declare_clippy_lint! {
  /// }
  /// }
  /// ```
- 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 @@ impl<'tcx> LateLintPass<'tcx> for SelfNamedConstructor {
  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 → tests/ui/extend_with_drain.fixed b/tests/ui/append_instead_of_extend.fixed → 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 → tests/ui/extend_with_drain.rs b/tests/ui/append_instead_of_extend.rs → 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 → tests/ui/extend_with_drain.stderr b/tests/ui/append_instead_of_extend.stderr → 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
@@ -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
@@ -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 → tests/ui/self_named_constructors.rs b/tests/ui/self_named_constructor.rs → 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 → tests/ui/self_named_constructors.stderr b/tests/ui/self_named_constructor.stderr → 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
@@ -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
@@ -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
@@ -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]