mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change MSRV check for manual_pattern_char_comparison only for pattern arrays

Browse Source
This commit is contained in:
AurelienFT 2024-06-15 21:52:42 +02:00
parent 63388cbab8
commit 51c6630d4f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clippy_lints/src/string_patterns.rs
View File

@ -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 if let ExprKind::Closure(closure) = method_arg.kind
&& let body = cx.tcx.hir().body(closure.body) && let body = cx.tcx.hir().body(closure.body)
&& let Some(PatKind::Binding(_, binding, ..)) = body.params.first().map(|p| p.pat.kind) && 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; return;
} }
if set_char_spans.len() > 1 && !msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {
return;
}
span_lint_and_then( span_lint_and_then(
cx, cx,
MANUAL_PATTERN_CHAR_COMPARISON, MANUAL_PATTERN_CHAR_COMPARISON,
@ -232,10 +235,8 @@ impl<'tcx> LateLintPass<'tcx> for StringPatterns {
&& let Some(arg) = args.get(pos) && let Some(arg) = args.get(pos)
{ {
check_single_char_pattern_lint(cx, arg); check_single_char_pattern_lint(cx, arg);
if !self.msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {
return; check_manual_pattern_char_comparison(cx, arg, &self.msrv);
}
check_manual_pattern_char_comparison(cx, arg);
} }
} }

2
tests/ui/manual_pattern_char_comparison.fixed
View File

@ -58,4 +58,4 @@ fn msrv_1_57() {
fn msrv_1_58() { fn msrv_1_58() {
let sentence = "Hello, world!"; let sentence = "Hello, world!";
sentence.trim_end_matches(['.', ',', '!', '?']); sentence.trim_end_matches(['.', ',', '!', '?']);
} }