f

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/update_lints.rs

@@ -49,6 +49,7 @@ macro_rules! declare_lint_crates {
 }
 declare_lint_crates! {
     clippy_lints,
+    clippy_lints_methods,
 }
 
 /// Runs the `update_lints` command.
@@ -196,7 +197,7 @@ pub fn generate_lint_files(
                 |dst| {
                     for lint_mod in lints
                         .iter()
-                        .filter(|l| l.def_crate == c)
+                        .filter(|l| l.def_crate == c && !l.module.is_empty())
                         .map(|l| l.module.split_once("::").map_or(&*l.module, |x| x.0))
                         .sorted()
                         .dedup()
@@ -213,13 +214,17 @@ pub fn generate_lint_files(
             &mut |_, src, dst| {
                 dst.push_str(GENERATED_FILE_COMMENT);
                 dst.push_str("pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[\n");
-                for (module_name, lint_name) in lints
+                for (module, lint_name) in lints
                     .iter()
                     .filter(|l| l.def_crate == c)
                     .map(|l| (&l.module, l.name.to_uppercase()))
                     .sorted()
                 {
-                    writeln!(dst, "    crate::{module_name}::{lint_name}_INFO,").unwrap();
+                    if module.is_empty() {
+                        writeln!(dst, "    crate::{lint_name}_INFO,").unwrap();
+                    } else {
+                        writeln!(dst, "    crate::{module}::{lint_name}_INFO,").unwrap();
+                    }
                 }
                 dst.push_str("];\n");
                 UpdateStatus::from_changed(src != dst)
@@ -284,7 +289,7 @@ fn read_src_with_module(src_root: &Path) -> impl use<'_> + Iterator<Item = (DirE
         };
         let path = e.path().as_os_str().as_encoded_bytes();
         if let Some(path) = path.strip_suffix(b".rs")
-            && let Some(path) = path.get("clippy_lints/src/".len()..)
+            && let Some(path) = path.get(src_root.as_os_str().len() + 1..)
         {
             if path == b"lib" {
                 Some((e, String::new()))

clippy_lints/src/declared_lints.rs

@@ -344,153 +344,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::CLONED_INSTEAD_OF_COPIED_INFO,
-    crate::methods::CLONE_ON_COPY_INFO,
-    crate::methods::CLONE_ON_REF_PTR_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::IS_DIGIT_ASCII_RADIX_INFO,
-    crate::methods::ITERATOR_STEP_BY_ZERO_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::JOIN_ABSOLUTE_PATHS_INFO,
-    crate::methods::MANUAL_CONTAINS_INFO,
-    crate::methods::MANUAL_C_STR_LITERALS_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::NONSENSICAL_OPEN_OPTIONS_INFO,
-    crate::methods::NO_EFFECT_REPLACE_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::READONLY_WRITE_LOCK_INFO,
-    crate::methods::READ_LINE_WITHOUT_TRIM_INFO,
-    crate::methods::REDUNDANT_AS_STR_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::STRING_EXTEND_CHARS_INFO,
-    crate::methods::STRING_LIT_CHARS_ANY_INFO,
-    crate::methods::STR_SPLIT_AT_NEWLINE_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/ineffective_open_options.rs

@@ -1,14 +1,13 @@
-use super::method_call;
 use clippy_utils::diagnostics::span_lint_and_sugg;
-use clippy_utils::peel_blocks;
+use clippy_utils::{peel_blocks, sym};
 use declare_clippy_lint::declare_clippy_lint;
 use rustc_ast::LitKind;
 use rustc_errors::Applicability;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty;
 use rustc_session::declare_lint_pass;
-use rustc_span::{BytePos, Span, sym};
+use rustc_span::{BytePos, Span};
 
 declare_clippy_lint! {
     /// ### What it does
@@ -58,39 +57,39 @@ fn index_if_arg_is_boolean(args: &[Expr<'_>], call_span: Span) -> Option<Span> {
 
 impl<'tcx> LateLintPass<'tcx> for IneffectiveOpenOptions {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
-        let Some(("open", mut receiver, [_arg], _, _)) = method_call(expr) else {
-            return;
-        };
-        let receiver_ty = cx.typeck_results().expr_ty(receiver);
-        match receiver_ty.peel_refs().kind() {
-            ty::Adt(adt, _) if cx.tcx.is_diagnostic_item(sym::FsOpenOptions, adt.did()) => {},
-            _ => return,
-        }
-
-        let mut append = None;
-        let mut write = None;
-
-        while let Some((name, recv, args, _, span)) = method_call(receiver) {
-            if name == "append" {
-                append = index_if_arg_is_boolean(args, span);
-            } else if name == "write" {
-                write = index_if_arg_is_boolean(args, span);
+        if let ExprKind::MethodCall(path, mut recv, [_], ..) = expr.kind
+            && path.ident.name == sym::open
+            && !expr.span.from_expansion()
+            && let recv_ty = cx.typeck_results().expr_ty(recv)
+            && let ty::Adt(adt, _) = *recv_ty.peel_refs().kind()
+            && cx.tcx.is_diagnostic_item(sym::FsOpenOptions, adt.did())
+        {
+            let mut append = None;
+            let mut write = None;
+            while let ExprKind::MethodCall(path, next_recv, args, span) = recv.kind
+                && !recv.span.from_expansion()
+            {
+                match path.ident.name {
+                    sym::append => append = index_if_arg_is_boolean(args, span),
+                    sym::write => write = index_if_arg_is_boolean(args, span),
+                    _ => {},
+                }
+                recv = next_recv;
             }
-            receiver = recv;
-        }
 
-        if let Some(write_span) = write
-            && append.is_some()
-        {
-            span_lint_and_sugg(
-                cx,
-                INEFFECTIVE_OPEN_OPTIONS,
-                write_span,
-                "unnecessary use of `.write(true)` because there is `.append(true)`",
-                "remove `.write(true)`",
-                String::new(),
-                Applicability::MachineApplicable,
-            );
+            if let Some(write_span) = write
+                && append.is_some()
+            {
+                span_lint_and_sugg(
+                    cx,
+                    INEFFECTIVE_OPEN_OPTIONS,
+                    write_span,
+                    "unnecessary use of `.write(true)` because there is `.append(true)`",
+                    "remove `.write(true)`",
+                    String::new(),
+                    Applicability::MachineApplicable,
+                );
+            }
         }
     }
 }

clippy_lints/src/lib.rs

@@ -226,7 +226,6 @@ mod map_unit_fn;
 mod match_result_ok;
 mod matches;
 mod mem_replace;
-mod methods;
 mod min_ident_chars;
 mod minmax;
 mod misc;
@@ -435,8 +434,13 @@ pub fn explain(name: &str) -> i32 {
 ///
 /// Used in `./src/driver.rs`.
 #[expect(clippy::too_many_lines)]
-pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf, groups: &mut RegistrationGroups) {
+pub fn register_lints(
+    store: &mut rustc_lint::LintStore,
+    conf: &'static Conf,
+    groups: &mut RegistrationGroups,
+) -> FormatArgsStorage {
     groups.insert_lints(declared_lints::LINTS);
+    store.register_lints(&declared_lints::LINTS.iter().map(|x| *x.lint).collect::<Vec<_>>());
 
     for (old_name, new_name) in deprecated_lints::RENAMED {
         store.register_renamed(old_name, new_name);
@@ -502,8 +506,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf, gr
     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)));
@@ -827,4 +829,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf, gr
     store.register_late_pass(move |_| Box::new(redundant_test_prefix::RedundantTestPrefix));
     store.register_late_pass(|_| Box::new(cloned_ref_to_slice_refs::ClonedRefToSliceRefs::new(conf)));
     // add lints here, do not remove this comment, it's used in `new_lint`
+
+    format_args_storage
 }