Rename set_contains_or_insert to contains_or_insert

Make the name of the lint more generic in order to support other collections like `BTreeSet`, `HashMap`, etc

Author: nyurik

CHANGELOG.md

@@ -5277,6 +5277,7 @@ Released 2018-09-13
 [`comparison_to_empty`]: https://rust-lang.github.io/rust-clippy/master/index.html#comparison_to_empty
 [`const_is_empty`]: https://rust-lang.github.io/rust-clippy/master/index.html#const_is_empty
 [`const_static_lifetime`]: https://rust-lang.github.io/rust-clippy/master/index.html#const_static_lifetime
+[`contains_or_insert`]: https://rust-lang.github.io/rust-clippy/master/index.html#contains_or_insert
 [`copy_iterator`]: https://rust-lang.github.io/rust-clippy/master/index.html#copy_iterator
 [`crate_in_macro_def`]: https://rust-lang.github.io/rust-clippy/master/index.html#crate_in_macro_def
 [`create_dir`]: https://rust-lang.github.io/rust-clippy/master/index.html#create_dir
@@ -5800,7 +5801,6 @@ Released 2018-09-13
 [`semicolon_outside_block`]: https://rust-lang.github.io/rust-clippy/master/index.html#semicolon_outside_block
 [`separated_literal_suffix`]: https://rust-lang.github.io/rust-clippy/master/index.html#separated_literal_suffix
 [`serde_api_misuse`]: https://rust-lang.github.io/rust-clippy/master/index.html#serde_api_misuse
-[`set_contains_or_insert`]: https://rust-lang.github.io/rust-clippy/master/index.html#set_contains_or_insert
 [`shadow_reuse`]: https://rust-lang.github.io/rust-clippy/master/index.html#shadow_reuse
 [`shadow_same`]: https://rust-lang.github.io/rust-clippy/master/index.html#shadow_same
 [`shadow_unrelated`]: https://rust-lang.github.io/rust-clippy/master/index.html#shadow_unrelated

clippy_lints/src/set_contains_or_insert.rs renamed to clippy_lints/src/contains_or_insert.rs

@@ -43,12 +43,12 @@ declare_clippy_lint! {
     /// }
     /// ```
     #[clippy::version = "1.80.0"]
-    pub SET_CONTAINS_OR_INSERT,
+    pub CONTAINS_OR_INSERT,
     nursery,
     "call to `HashSet::contains` followed by `HashSet::insert`"
 }
 
-declare_lint_pass!(HashsetInsertAfterContains => [SET_CONTAINS_OR_INSERT]);
+declare_lint_pass!(HashsetInsertAfterContains => [CONTAINS_OR_INSERT]);
 
 impl<'tcx> LateLintPass<'tcx> for HashsetInsertAfterContains {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
@@ -63,7 +63,7 @@ impl<'tcx> LateLintPass<'tcx> for HashsetInsertAfterContains {
         {
             span_lint(
                 cx,
-                SET_CONTAINS_OR_INSERT,
+                CONTAINS_OR_INSERT,
                 vec![contains_expr.span, insert_expr.span],
                 "usage of `HashSet::insert` after `HashSet::contains`",
             );

clippy_lints/src/declared_lints.rs

@@ -111,6 +111,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
     crate::collapsible_if::COLLAPSIBLE_IF_INFO,
     crate::collection_is_never_read::COLLECTION_IS_NEVER_READ_INFO,
     crate::comparison_chain::COMPARISON_CHAIN_INFO,
+    crate::contains_or_insert::CONTAINS_OR_INSERT_INFO,
     crate::copies::BRANCHES_SHARING_CODE_INFO,
     crate::copies::IFS_SAME_COND_INFO,
     crate::copies::IF_SAME_THEN_ELSE_INFO,
@@ -647,7 +648,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
     crate::semicolon_block::SEMICOLON_OUTSIDE_BLOCK_INFO,
     crate::semicolon_if_nothing_returned::SEMICOLON_IF_NOTHING_RETURNED_INFO,
     crate::serde_api::SERDE_API_MISUSE_INFO,
-    crate::set_contains_or_insert::SET_CONTAINS_OR_INSERT_INFO,
     crate::shadow::SHADOW_REUSE_INFO,
     crate::shadow::SHADOW_SAME_INFO,
     crate::shadow::SHADOW_UNRELATED_INFO,

clippy_lints/src/lib.rs

@@ -98,6 +98,7 @@ mod cognitive_complexity;
 mod collapsible_if;
 mod collection_is_never_read;
 mod comparison_chain;
+mod contains_or_insert;
 mod copies;
 mod copy_iterator;
 mod crate_in_macro_def;
@@ -320,7 +321,6 @@ mod self_named_constructors;
 mod semicolon_block;
 mod semicolon_if_nothing_returned;
 mod serde_api;
-mod set_contains_or_insert;
 mod shadow;
 mod significant_drop_tightening;
 mod single_call_fn;
@@ -1175,7 +1175,7 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
     });
     store.register_late_pass(move |_| Box::new(string_patterns::StringPatterns::new(msrv())));
     store.register_early_pass(|| Box::new(field_scoped_visibility_modifiers::FieldScopedVisibilityModifiers));
-    store.register_late_pass(|_| Box::new(set_contains_or_insert::HashsetInsertAfterContains));
+    store.register_late_pass(|_| Box::new(contains_or_insert::HashsetInsertAfterContains));
     store.register_early_pass(|| Box::new(byte_char_slices::ByteCharSlice));
     store.register_early_pass(|| Box::new(cfg_not_test::CfgNotTest));
     // add lints here, do not remove this comment, it's used in `new_lint`

tests/ui/set_contains_or_insert.rs renamed to tests/ui/contains_or_insert.rs

@@ -1,7 +1,7 @@
 #![allow(unused)]
 #![allow(clippy::nonminimal_bool)]
 #![allow(clippy::needless_borrow)]
-#![warn(clippy::set_contains_or_insert)]
+#![warn(clippy::contains_or_insert)]
 
 use std::collections::HashSet;
 

tests/ui/set_contains_or_insert.stderr renamed to tests/ui/contains_or_insert.stderr

@@ -1,61 +1,60 @@
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:18:13
+  --> tests/ui/contains_or_insert.rs:18:13
    |
 LL |     if !set.contains(&value) {
    |             ^^^^^^^^^^^^^^^^
 LL |         set.insert(value);
    |             ^^^^^^^^^^^^^
    |
    = note: `-D clippy::set-contains-or-insert` implied by `-D warnings`
-   = help: to override `-D warnings` add `#[allow(clippy::set_contains_or_insert)]`
+   = help: to override `-D warnings` add `#[allow(clippy::contains_or_insert)]`
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:23:12
+  --> tests/ui/contains_or_insert.rs:23:12
    |
 LL |     if set.contains(&value) {
    |            ^^^^^^^^^^^^^^^^
 LL |         set.insert(value);
    |             ^^^^^^^^^^^^^
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:28:13
+  --> tests/ui/contains_or_insert.rs:28:13
    |
 LL |     if !set.contains(&value) {
    |             ^^^^^^^^^^^^^^^^
 LL |         set.insert(value);
    |             ^^^^^^^^^^^^^
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:32:14
+  --> tests/ui/contains_or_insert.rs:32:14
    |
 LL |     if !!set.contains(&value) {
    |              ^^^^^^^^^^^^^^^^
 LL |         set.insert(value);
    |             ^^^^^^^^^^^^^
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:37:15
+  --> tests/ui/contains_or_insert.rs:37:15
    |
 LL |     if (&set).contains(&value) {
    |               ^^^^^^^^^^^^^^^^
 LL |         set.insert(value);
    |             ^^^^^^^^^^^^^
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:42:13
+  --> tests/ui/contains_or_insert.rs:42:13
    |
 LL |     if !set.contains(borrow_value) {
    |             ^^^^^^^^^^^^^^^^^^^^^^
 LL |         set.insert(*borrow_value);
    |             ^^^^^^^^^^^^^^^^^^^^^
 
 error: usage of `HashSet::insert` after `HashSet::contains`
-  --> tests/ui/set_contains_or_insert.rs:47:20
+  --> tests/ui/contains_or_insert.rs:47:20
    |
 LL |     if !borrow_set.contains(&value) {
    |                    ^^^^^^^^^^^^^^^^
 LL |         borrow_set.insert(value);
    |                    ^^^^^^^^^^^^^
 
 error: aborting due to 7 previous errors
-