fixed msrv

Author: nyurik

clippy_lints/src/format_args.rs

@@ -115,15 +115,13 @@ declare_clippy_lint! {
 impl_lint_pass!(FormatArgs => [FORMAT_IN_FORMAT_ARGS, NEEDLESS_FORMAT_ARGS, TO_STRING_IN_FORMAT_ARGS]);
 
 pub struct FormatArgs {
-    format_args_capture: bool,
+    msrv: Option<RustcVersion>,
 }
 
 impl FormatArgs {
     #[must_use]
     pub fn new(msrv: Option<RustcVersion>) -> Self {
-        Self {
-            format_args_capture: meets_msrv(msrv, msrvs::FORMAT_ARGS_CAPTURE),
-        }
+        Self { msrv }
     }
 }
 
@@ -148,7 +146,7 @@ impl<'tcx> LateLintPass<'tcx> for FormatArgs {
                     check_to_string_in_format_args(cx, name, arg.param.value);
                 }
 
-                if !self.format_args_capture {
+                if !meets_msrv(self.msrv, msrvs::FORMAT_ARGS_CAPTURE) {
                     return;
                 }
                 let mut inline_spans = Vec::new();
@@ -173,6 +171,8 @@ impl<'tcx> LateLintPass<'tcx> for FormatArgs {
             }
         }
     }
+
+    extract_msrv_attr!(LateContext);
 }
 
 fn check_inline(cx: &LateContext<'_>, param: &FormatParam<'_>, inline_spans: &mut Vec<(Span, String)>) -> bool {

clippy_lints/src/utils/conf.rs

@@ -213,7 +213,7 @@ define_Conf! {
     ///
     /// Suppress lints whenever the suggested change would cause breakage for other crates.
     (avoid_breaking_exported_api: bool = true),
-    /// Lint: MANUAL_SPLIT_ONCE, MANUAL_STR_REPEAT, CLONED_INSTEAD_OF_COPIED, REDUNDANT_FIELD_NAMES, REDUNDANT_STATIC_LIFETIMES, FILTER_MAP_NEXT, CHECKED_CONVERSIONS, MANUAL_RANGE_CONTAINS, USE_SELF, MEM_REPLACE_WITH_DEFAULT, MANUAL_NON_EXHAUSTIVE, OPTION_AS_REF_DEREF, MAP_UNWRAP_OR, MATCH_LIKE_MATCHES_MACRO, MANUAL_STRIP, MISSING_CONST_FOR_FN, UNNESTED_OR_PATTERNS, FROM_OVER_INTO, PTR_AS_PTR, IF_THEN_SOME_ELSE_NONE, APPROX_CONSTANT, DEPRECATED_CFG_ATTR, INDEX_REFUTABLE_SLICE, MAP_CLONE, BORROW_AS_PTR, MANUAL_BITS, ERR_EXPECT, CAST_ABS_TO_UNSIGNED.
+    /// Lint: MANUAL_SPLIT_ONCE, MANUAL_STR_REPEAT, CLONED_INSTEAD_OF_COPIED, REDUNDANT_FIELD_NAMES, REDUNDANT_STATIC_LIFETIMES, FILTER_MAP_NEXT, CHECKED_CONVERSIONS, MANUAL_RANGE_CONTAINS, USE_SELF, MEM_REPLACE_WITH_DEFAULT, MANUAL_NON_EXHAUSTIVE, OPTION_AS_REF_DEREF, MAP_UNWRAP_OR, MATCH_LIKE_MATCHES_MACRO, MANUAL_STRIP, MISSING_CONST_FOR_FN, UNNESTED_OR_PATTERNS, FROM_OVER_INTO, PTR_AS_PTR, IF_THEN_SOME_ELSE_NONE, APPROX_CONSTANT, DEPRECATED_CFG_ATTR, INDEX_REFUTABLE_SLICE, MAP_CLONE, BORROW_AS_PTR, MANUAL_BITS, ERR_EXPECT, CAST_ABS_TO_UNSIGNED, NEEDLESS_FORMAT_ARGS.
     ///
     /// The minimum rust version that the project supports
     (msrv: Option<String> = None),

tests/ui/needless_format_args.fixed

@@ -125,7 +125,7 @@ fn main() {
 fn _under_msrv() {
     #![clippy::msrv = "1.57"]
     let local_i32 = 1;
-    println!("don't expand='{local_i32}'");
+    println!("don't expand='{}'", local_i32);
 }
 
 fn _meets_msrv() {

tests/ui/needless_format_args.stderr

@@ -850,18 +850,6 @@ LL -     println!("{}", format!("{}", local_i32));
 LL +     println!("{}", format!("{local_i32}"));
    |
 
-error: variables can be used directly in the `format!` string
-  --> $DIR/needless_format_args.rs:131:5
-   |
-LL |     println!("don't expand='{}'", local_i32);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: change this to
-   |
-LL -     println!("don't expand='{}'", local_i32);
-LL +     println!("don't expand='{local_i32}'");
-   |
-
 error: variables can be used directly in the `format!` string
   --> $DIR/needless_format_args.rs:137:5
    |
@@ -874,5 +862,5 @@ LL -     println!("expand='{}'", local_i32);
 LL +     println!("expand='{local_i32}'");
    |
 
-error: aborting due to 72 previous errors
+error: aborting due to 71 previous errors