Change MSRV check for manual_pattern_char_comparison only for pattern arrays

AurelienFT · AurelienFT · commit 51c6630d4f70 · 2024-06-15T21:52:42.000+02:00
diff --git a/clippy_lints/src/string_patterns.rs b/clippy_lints/src/string_patterns.rs
@@ -134,7 +134,7 @@ fn get_char_span<'tcx>(cx: &'_ LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Optio
     }
 }
 
-fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<'_>) {
+fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<'_>, msrv: &Msrv) {
     if let ExprKind::Closure(closure) = method_arg.kind
         && let body = cx.tcx.hir().body(closure.body)
         && let Some(PatKind::Binding(_, binding, ..)) = body.params.first().map(|p| p.pat.kind)
@@ -190,6 +190,9 @@ fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<
         {
             return;
         }
+        if set_char_spans.len() > 1 && !msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {
+            return;
+        }
         span_lint_and_then(
             cx,
             MANUAL_PATTERN_CHAR_COMPARISON,
@@ -232,10 +235,8 @@ impl<'tcx> LateLintPass<'tcx> for StringPatterns {
             && let Some(arg) = args.get(pos)
         {
             check_single_char_pattern_lint(cx, arg);
-            if !self.msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {
-                return;
-            }
-            check_manual_pattern_char_comparison(cx, arg);
+
+            check_manual_pattern_char_comparison(cx, arg, &self.msrv);
         }
     }
 
diff --git a/tests/ui/manual_pattern_char_comparison.fixed b/tests/ui/manual_pattern_char_comparison.fixed
@@ -58,4 +58,4 @@ fn msrv_1_57() {
 fn msrv_1_58() {
     let sentence = "Hello, world!";
     sentence.trim_end_matches(['.', ',', '!', '?']);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ fn get_char_span<'tcx>(cx: &'_ LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Optio`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`-fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<'_>) {`
	`137`	`+fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<'_>, msrv: &Msrv) {`
`138`	`138`	`if let ExprKind::Closure(closure) = method_arg.kind`
`139`	`139`	`&& let body = cx.tcx.hir().body(closure.body)`
`140`	`140`	`&& let Some(PatKind::Binding(_, binding, ..)) = body.params.first().map(\|p\| p.pat.kind)`
`@@ -190,6 +190,9 @@ fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<`
`190`	`190`	`{`
`191`	`191`	`return;`
`192`	`192`	`}`
	`193`	`+ if set_char_spans.len() > 1 && !msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {`
	`194`	`+ return;`
	`195`	`+ }`
`193`	`196`	`span_lint_and_then(`
`194`	`197`	`cx,`
`195`	`198`	`MANUAL_PATTERN_CHAR_COMPARISON,`
`@@ -232,10 +235,8 @@ impl<'tcx> LateLintPass<'tcx> for StringPatterns {`
`232`	`235`	`&& let Some(arg) = args.get(pos)`
`233`	`236`	`{`
`234`	`237`	`check_single_char_pattern_lint(cx, arg);`
`235`		`- if !self.msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {`
`236`		`- return;`
`237`		`- }`
`238`		`- check_manual_pattern_char_comparison(cx, arg);`
	`238`	`+`
	`239`	`+ check_manual_pattern_char_comparison(cx, arg, &self.msrv);`
`239`	`240`	`}`
`240`	`241`	`}`
`241`	`242`