Move methods lint pass to a new crate part 2

Author: Jarcho

Cargo.toml

@@ -23,6 +23,7 @@ path = "src/driver.rs"
 [dependencies]
 clippy_config = { path = "clippy_config" }
 clippy_lints = { path = "clippy_lints" }
+clippy_lints_methods = { path = "clippy_lints_methods" }
 clippy_utils = { path = "clippy_utils" }
 declare_clippy_lint = { path = "declare_clippy_lint" }
 rustc_tools_util = { path = "rustc_tools_util", version = "0.4.2" }

clippy_dev/src/release.rs

@@ -4,6 +4,7 @@ use std::fmt::Write;
 static CARGO_TOML_FILES: &[&str] = &[
     "clippy_config/Cargo.toml",
     "clippy_lints/Cargo.toml",
+    "clippy_lints_methods/Cargo.toml",
     "clippy_utils/Cargo.toml",
     "declare_clippy_lint/Cargo.toml",
     "Cargo.toml",

clippy_dev/src/serve.rs

@@ -22,6 +22,7 @@ pub fn run(port: u16, lint: Option<String>) -> ! {
         let index_time = mtime("util/gh-pages/index.html");
         let times = [
             "clippy_lints/src",
+            "clippy_lints_methods/src",
             "util/gh-pages/index_template.html",
             "tests/compile-test.rs",
         ]

clippy_dev/src/setup/intellij.rs

@@ -14,6 +14,11 @@ const DEPENDENCIES_SECTION: &str = "[dependencies]";
 const CLIPPY_PROJECTS: &[ClippyProjectInfo] = &[
     ClippyProjectInfo::new("root", "Cargo.toml", "src/driver.rs"),
     ClippyProjectInfo::new("clippy_lints", "clippy_lints/Cargo.toml", "clippy_lints/src/lib.rs"),
+    ClippyProjectInfo::new(
+        "clippy_lints_methods",
+        "clippy_lints_methods/Cargo.toml",
+        "clippy_lints_methods/src/lib.rs",
+    ),
     ClippyProjectInfo::new("clippy_utils", "clippy_utils/Cargo.toml", "clippy_utils/src/lib.rs"),
 ];
 

clippy_lints/src/declared_lints.rs

@@ -349,155 +349,6 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::mem_replace::MEM_REPLACE_OPTION_WITH_SOME_INFO,
     crate::mem_replace::MEM_REPLACE_WITH_DEFAULT_INFO,
     crate::mem_replace::MEM_REPLACE_WITH_UNINIT_INFO,
-    crate::methods::BIND_INSTEAD_OF_MAP_INFO,
-    crate::methods::BYTES_COUNT_TO_LEN_INFO,
-    crate::methods::BYTES_NTH_INFO,
-    crate::methods::CASE_SENSITIVE_FILE_EXTENSION_COMPARISONS_INFO,
-    crate::methods::CHARS_LAST_CMP_INFO,
-    crate::methods::CHARS_NEXT_CMP_INFO,
-    crate::methods::CLEAR_WITH_DRAIN_INFO,
-    crate::methods::CLONE_ON_COPY_INFO,
-    crate::methods::CLONE_ON_REF_PTR_INFO,
-    crate::methods::CLONED_INSTEAD_OF_COPIED_INFO,
-    crate::methods::COLLAPSIBLE_STR_REPLACE_INFO,
-    crate::methods::CONST_IS_EMPTY_INFO,
-    crate::methods::DOUBLE_ENDED_ITERATOR_LAST_INFO,
-    crate::methods::DRAIN_COLLECT_INFO,
-    crate::methods::ERR_EXPECT_INFO,
-    crate::methods::EXPECT_FUN_CALL_INFO,
-    crate::methods::EXPECT_USED_INFO,
-    crate::methods::EXTEND_WITH_DRAIN_INFO,
-    crate::methods::FILETYPE_IS_FILE_INFO,
-    crate::methods::FILTER_MAP_BOOL_THEN_INFO,
-    crate::methods::FILTER_MAP_IDENTITY_INFO,
-    crate::methods::FILTER_MAP_NEXT_INFO,
-    crate::methods::FILTER_NEXT_INFO,
-    crate::methods::FLAT_MAP_IDENTITY_INFO,
-    crate::methods::FLAT_MAP_OPTION_INFO,
-    crate::methods::FORMAT_COLLECT_INFO,
-    crate::methods::FROM_ITER_INSTEAD_OF_COLLECT_INFO,
-    crate::methods::GET_FIRST_INFO,
-    crate::methods::GET_LAST_WITH_LEN_INFO,
-    crate::methods::GET_UNWRAP_INFO,
-    crate::methods::IMPLICIT_CLONE_INFO,
-    crate::methods::INEFFICIENT_TO_STRING_INFO,
-    crate::methods::INSPECT_FOR_EACH_INFO,
-    crate::methods::INTO_ITER_ON_REF_INFO,
-    crate::methods::IO_OTHER_ERROR_INFO,
-    crate::methods::IP_CONSTANT_INFO,
-    crate::methods::IS_DIGIT_ASCII_RADIX_INFO,
-    crate::methods::ITER_CLONED_COLLECT_INFO,
-    crate::methods::ITER_COUNT_INFO,
-    crate::methods::ITER_FILTER_IS_OK_INFO,
-    crate::methods::ITER_FILTER_IS_SOME_INFO,
-    crate::methods::ITER_KV_MAP_INFO,
-    crate::methods::ITER_NEXT_SLICE_INFO,
-    crate::methods::ITER_NTH_INFO,
-    crate::methods::ITER_NTH_ZERO_INFO,
-    crate::methods::ITER_ON_EMPTY_COLLECTIONS_INFO,
-    crate::methods::ITER_ON_SINGLE_ITEMS_INFO,
-    crate::methods::ITER_OUT_OF_BOUNDS_INFO,
-    crate::methods::ITER_OVEREAGER_CLONED_INFO,
-    crate::methods::ITER_SKIP_NEXT_INFO,
-    crate::methods::ITER_SKIP_ZERO_INFO,
-    crate::methods::ITER_WITH_DRAIN_INFO,
-    crate::methods::ITERATOR_STEP_BY_ZERO_INFO,
-    crate::methods::JOIN_ABSOLUTE_PATHS_INFO,
-    crate::methods::MANUAL_C_STR_LITERALS_INFO,
-    crate::methods::MANUAL_CONTAINS_INFO,
-    crate::methods::MANUAL_FILTER_MAP_INFO,
-    crate::methods::MANUAL_FIND_MAP_INFO,
-    crate::methods::MANUAL_INSPECT_INFO,
-    crate::methods::MANUAL_IS_VARIANT_AND_INFO,
-    crate::methods::MANUAL_NEXT_BACK_INFO,
-    crate::methods::MANUAL_OK_OR_INFO,
-    crate::methods::MANUAL_REPEAT_N_INFO,
-    crate::methods::MANUAL_SATURATING_ARITHMETIC_INFO,
-    crate::methods::MANUAL_SPLIT_ONCE_INFO,
-    crate::methods::MANUAL_STR_REPEAT_INFO,
-    crate::methods::MANUAL_TRY_FOLD_INFO,
-    crate::methods::MAP_ALL_ANY_IDENTITY_INFO,
-    crate::methods::MAP_CLONE_INFO,
-    crate::methods::MAP_COLLECT_RESULT_UNIT_INFO,
-    crate::methods::MAP_ERR_IGNORE_INFO,
-    crate::methods::MAP_FLATTEN_INFO,
-    crate::methods::MAP_IDENTITY_INFO,
-    crate::methods::MAP_UNWRAP_OR_INFO,
-    crate::methods::MAP_WITH_UNUSED_ARGUMENT_OVER_RANGES_INFO,
-    crate::methods::MUT_MUTEX_LOCK_INFO,
-    crate::methods::NAIVE_BYTECOUNT_INFO,
-    crate::methods::NEEDLESS_AS_BYTES_INFO,
-    crate::methods::NEEDLESS_CHARACTER_ITERATION_INFO,
-    crate::methods::NEEDLESS_COLLECT_INFO,
-    crate::methods::NEEDLESS_OPTION_AS_DEREF_INFO,
-    crate::methods::NEEDLESS_OPTION_TAKE_INFO,
-    crate::methods::NEEDLESS_SPLITN_INFO,
-    crate::methods::NEW_RET_NO_SELF_INFO,
-    crate::methods::NO_EFFECT_REPLACE_INFO,
-    crate::methods::NONSENSICAL_OPEN_OPTIONS_INFO,
-    crate::methods::OBFUSCATED_IF_ELSE_INFO,
-    crate::methods::OK_EXPECT_INFO,
-    crate::methods::OPTION_AS_REF_CLONED_INFO,
-    crate::methods::OPTION_AS_REF_DEREF_INFO,
-    crate::methods::OPTION_FILTER_MAP_INFO,
-    crate::methods::OPTION_MAP_OR_NONE_INFO,
-    crate::methods::OR_FUN_CALL_INFO,
-    crate::methods::OR_THEN_UNWRAP_INFO,
-    crate::methods::PATH_BUF_PUSH_OVERWRITE_INFO,
-    crate::methods::PATH_ENDS_WITH_EXT_INFO,
-    crate::methods::RANGE_ZIP_WITH_LEN_INFO,
-    crate::methods::READ_LINE_WITHOUT_TRIM_INFO,
-    crate::methods::READONLY_WRITE_LOCK_INFO,
-    crate::methods::REDUNDANT_AS_STR_INFO,
-    crate::methods::REDUNDANT_ITER_CLONED_INFO,
-    crate::methods::REPEAT_ONCE_INFO,
-    crate::methods::RESULT_FILTER_MAP_INFO,
-    crate::methods::RESULT_MAP_OR_INTO_OPTION_INFO,
-    crate::methods::RETURN_AND_THEN_INFO,
-    crate::methods::SEARCH_IS_SOME_INFO,
-    crate::methods::SEEK_FROM_CURRENT_INFO,
-    crate::methods::SEEK_TO_START_INSTEAD_OF_REWIND_INFO,
-    crate::methods::SHOULD_IMPLEMENT_TRAIT_INFO,
-    crate::methods::SINGLE_CHAR_ADD_STR_INFO,
-    crate::methods::SKIP_WHILE_NEXT_INFO,
-    crate::methods::SLICED_STRING_AS_BYTES_INFO,
-    crate::methods::STABLE_SORT_PRIMITIVE_INFO,
-    crate::methods::STR_SPLIT_AT_NEWLINE_INFO,
-    crate::methods::STRING_EXTEND_CHARS_INFO,
-    crate::methods::STRING_LIT_CHARS_ANY_INFO,
-    crate::methods::SUSPICIOUS_COMMAND_ARG_SPACE_INFO,
-    crate::methods::SUSPICIOUS_MAP_INFO,
-    crate::methods::SUSPICIOUS_OPEN_OPTIONS_INFO,
-    crate::methods::SUSPICIOUS_SPLITN_INFO,
-    crate::methods::SUSPICIOUS_TO_OWNED_INFO,
-    crate::methods::SWAP_WITH_TEMPORARY_INFO,
-    crate::methods::TYPE_ID_ON_BOX_INFO,
-    crate::methods::UNBUFFERED_BYTES_INFO,
-    crate::methods::UNINIT_ASSUMED_INIT_INFO,
-    crate::methods::UNIT_HASH_INFO,
-    crate::methods::UNNECESSARY_FALLIBLE_CONVERSIONS_INFO,
-    crate::methods::UNNECESSARY_FILTER_MAP_INFO,
-    crate::methods::UNNECESSARY_FIND_MAP_INFO,
-    crate::methods::UNNECESSARY_FIRST_THEN_CHECK_INFO,
-    crate::methods::UNNECESSARY_FOLD_INFO,
-    crate::methods::UNNECESSARY_GET_THEN_CHECK_INFO,
-    crate::methods::UNNECESSARY_JOIN_INFO,
-    crate::methods::UNNECESSARY_LAZY_EVALUATIONS_INFO,
-    crate::methods::UNNECESSARY_LITERAL_UNWRAP_INFO,
-    crate::methods::UNNECESSARY_MAP_OR_INFO,
-    crate::methods::UNNECESSARY_MIN_OR_MAX_INFO,
-    crate::methods::UNNECESSARY_RESULT_MAP_OR_ELSE_INFO,
-    crate::methods::UNNECESSARY_SORT_BY_INFO,
-    crate::methods::UNNECESSARY_TO_OWNED_INFO,
-    crate::methods::UNWRAP_OR_DEFAULT_INFO,
-    crate::methods::UNWRAP_USED_INFO,
-    crate::methods::USELESS_ASREF_INFO,
-    crate::methods::USELESS_NONZERO_NEW_UNCHECKED_INFO,
-    crate::methods::VEC_RESIZE_TO_ZERO_INFO,
-    crate::methods::VERBOSE_FILE_READS_INFO,
-    crate::methods::WAKER_CLONE_WAKE_INFO,
-    crate::methods::WRONG_SELF_CONVENTION_INFO,
-    crate::methods::ZST_OFFSET_INFO,
     crate::min_ident_chars::MIN_IDENT_CHARS_INFO,
     crate::minmax::MIN_MAX_INFO,
     crate::misc::SHORT_CIRCUIT_STATEMENT_INFO,

clippy_lints/src/lib.rs

@@ -55,7 +55,6 @@ extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_target;
 extern crate rustc_trait_selection;
-extern crate smallvec;
 extern crate thin_vec;
 
 #[macro_use]
@@ -231,7 +230,6 @@ mod map_unit_fn;
 mod match_result_ok;
 mod matches;
 mod mem_replace;
-mod methods;
 mod min_ident_chars;
 mod minmax;
 mod misc;
@@ -440,7 +438,7 @@ pub fn explain(name: &str) -> i32 {
 ///
 /// Used in `./src/driver.rs`.
 #[expect(clippy::too_many_lines)]
-pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
+pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Conf) -> FormatArgsStorage {
     for (old_name, new_name) in deprecated_lints::RENAMED {
         store.register_renamed(old_name, new_name);
     }
@@ -503,8 +501,6 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(|_| Box::new(non_octal_unix_permissions::NonOctalUnixPermissions));
     store.register_early_pass(|| Box::new(unnecessary_self_imports::UnnecessarySelfImports));
     store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(conf)));
-    let format_args = format_args_storage.clone();
-    store.register_late_pass(move |_| Box::new(methods::Methods::new(conf, format_args.clone())));
     store.register_late_pass(move |_| Box::new(matches::Matches::new(conf)));
     store.register_late_pass(move |_| Box::new(manual_non_exhaustive::ManualNonExhaustive::new(conf)));
     store.register_late_pass(move |_| Box::new(manual_strip::ManualStrip::new(conf)));
@@ -831,4 +827,6 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(|_| Box::new(infallible_try_from::InfallibleTryFrom));
     store.register_late_pass(|_| Box::new(coerce_container_to_any::CoerceContainerToAny));
     // add lints here, do not remove this comment, it's used in `new_lint`
+
+    format_args_storage
 }

clippy_lints_methods/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "clippy_lints_methods"
+version = "0.1.90"
+description = "A bunch of helpful lints to avoid common pitfalls in Rust"
+repository = "https://github.com/rust-lang/rust-clippy"
+readme = "README.md"
+license = "MIT OR Apache-2.0"
+keywords = ["clippy", "lint", "plugin"]
+edition = "2024"
+
+[dependencies]
+clippy_config = { path = "../clippy_config" }
+clippy_utils = { path = "../clippy_utils" }
+declare_clippy_lint = { path = "../declare_clippy_lint" }
+itertools = "0.12"
+
+[package.metadata.rust-analyzer]
+# This crate uses #[feature(rustc_private)]
+rustc_private = true

clippy_lints_methods/src/bytes_nth.rs

@@ -6,7 +6,7 @@ use rustc_errors::Applicability;
 use rustc_hir::{Expr, LangItem};
 use rustc_lint::LateContext;
 
-use crate::methods::method_call;
+use crate::method_call;
 
 use super::BYTES_NTH;
 

clippy_lints_methods/src/chars_cmp.rs

@@ -10,7 +10,7 @@ use rustc_span::Symbol;
 /// Wrapper fn for `CHARS_NEXT_CMP` and `CHARS_LAST_CMP` lints.
 pub(super) fn check(
     cx: &LateContext<'_>,
-    info: &crate::methods::BinaryExprInfo<'_>,
+    info: &crate::BinaryExprInfo<'_>,
     chain_methods: &[Symbol],
     lint: &'static Lint,
     suggest: &str,

clippy_lints_methods/src/chars_cmp_with_unwrap.rs

@@ -10,7 +10,7 @@ use rustc_span::Symbol;
 /// Wrapper fn for `CHARS_NEXT_CMP` and `CHARS_LAST_CMP` lints with `unwrap()`.
 pub(super) fn check(
     cx: &LateContext<'_>,
-    info: &crate::methods::BinaryExprInfo<'_>,
+    info: &crate::BinaryExprInfo<'_>,
     chain_methods: &[Symbol],
     lint: &'static Lint,
     suggest: &str,