Skip to content

Commit 82345c3

Browse files
borsbors
committed
Auto merge of #12937 - AurelienFT:add_msrv_manual_patter_char_comparison, r=Alexendoo
Add MSRV for manual_pattern_char_comparison Fixes #12936 changelog: [`manual_pattern_char_comparison`]: Add MSRV 1.58
2 parents 0dc265f + 51c6630 commit 82345c3

7 files changed

+55
-7
lines changed

‎book/src/lint_configuration.md

+1
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ The minimum rust version that the project supports. Defaults to the `rust-versio
693693
* [`manual_is_ascii_check`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_ascii_check)
694694
* [`manual_let_else`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_let_else)
695695
* [`manual_non_exhaustive`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_non_exhaustive)
696+
* [`manual_pattern_char_comparison`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_pattern_char_comparison)
696697
* [`manual_range_contains`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains)
697698
* [`manual_rem_euclid`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_rem_euclid)
698699
* [`manual_retain`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_retain)

‎clippy_config/src/conf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ define_Conf! {
265265
///
266266
/// Suppress lints whenever the suggested change would cause breakage for other crates.
267267
(avoid_breaking_exported_api: bool = true),
268-
/// Lint: MANUAL_SPLIT_ONCE, MANUAL_STR_REPEAT, CLONED_INSTEAD_OF_COPIED, REDUNDANT_FIELD_NAMES, OPTION_MAP_UNWRAP_OR, 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, UNINLINED_FORMAT_ARGS, MANUAL_CLAMP, MANUAL_LET_ELSE, UNCHECKED_DURATION_SUBTRACTION, COLLAPSIBLE_STR_REPLACE, SEEK_FROM_CURRENT, SEEK_REWIND, UNNECESSARY_LAZY_EVALUATIONS, TRANSMUTE_PTR_TO_REF, ALMOST_COMPLETE_RANGE, NEEDLESS_BORROW, DERIVABLE_IMPLS, MANUAL_IS_ASCII_CHECK, MANUAL_REM_EUCLID, MANUAL_RETAIN, TYPE_REPETITION_IN_BOUNDS, TUPLE_ARRAY_CONVERSIONS, MANUAL_TRY_FOLD, MANUAL_HASH_ONE, ITER_KV_MAP, MANUAL_C_STR_LITERALS, ASSIGNING_CLONES, LEGACY_NUMERIC_CONSTANTS.
268+
/// Lint: MANUAL_SPLIT_ONCE, MANUAL_STR_REPEAT, CLONED_INSTEAD_OF_COPIED, REDUNDANT_FIELD_NAMES, OPTION_MAP_UNWRAP_OR, 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, UNINLINED_FORMAT_ARGS, MANUAL_CLAMP, MANUAL_LET_ELSE, UNCHECKED_DURATION_SUBTRACTION, COLLAPSIBLE_STR_REPLACE, SEEK_FROM_CURRENT, SEEK_REWIND, UNNECESSARY_LAZY_EVALUATIONS, TRANSMUTE_PTR_TO_REF, ALMOST_COMPLETE_RANGE, NEEDLESS_BORROW, DERIVABLE_IMPLS, MANUAL_IS_ASCII_CHECK, MANUAL_REM_EUCLID, MANUAL_RETAIN, TYPE_REPETITION_IN_BOUNDS, TUPLE_ARRAY_CONVERSIONS, MANUAL_TRY_FOLD, MANUAL_HASH_ONE, ITER_KV_MAP, MANUAL_C_STR_LITERALS, ASSIGNING_CLONES, LEGACY_NUMERIC_CONSTANTS, MANUAL_PATTERN_CHAR_COMPARISON.
269269
///
270270
/// The minimum rust version that the project supports. Defaults to the `rust-version` field in `Cargo.toml`
271271
#[default_text = ""]

‎clippy_lints/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
11681168
..Default::default()
11691169
})
11701170
});
1171-
store.register_late_pass(|_| Box::new(string_patterns::StringPatterns));
1171+
store.register_late_pass(move |_| Box::new(string_patterns::StringPatterns::new(msrv())));
11721172
// add lints here, do not remove this comment, it's used in `new_lint`
11731173
}
11741174

‎clippy_lints/src/string_patterns.rs

+21-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::ops::ControlFlow;
22

3+
use clippy_config::msrvs::{self, Msrv};
34
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
45
use clippy_utils::eager_or_lazy::switch_to_eager_eval;
56
use clippy_utils::macros::matching_root_macro_call;
@@ -12,7 +13,7 @@ use rustc_errors::Applicability;
1213
use rustc_hir::{Expr, ExprKind, PatKind};
1314
use rustc_lint::{LateContext, LateLintPass};
1415
use rustc_middle::ty;
15-
use rustc_session::declare_lint_pass;
16+
use rustc_session::impl_lint_pass;
1617
use rustc_span::{sym, Span};
1718

1819
declare_clippy_lint! {
@@ -69,7 +70,18 @@ declare_clippy_lint! {
6970
"using a single-character str where a char could be used, e.g., `_.split(\"x\")`"
7071
}
7172

72-
declare_lint_pass!(StringPatterns => [MANUAL_PATTERN_CHAR_COMPARISON, SINGLE_CHAR_PATTERN]);
73+
pub struct StringPatterns {
74+
msrv: Msrv,
75+
}
76+
77+
impl StringPatterns {
78+
#[must_use]
79+
pub fn new(msrv: Msrv) -> Self {
80+
Self { msrv }
81+
}
82+
}
83+
84+
impl_lint_pass!(StringPatterns => [MANUAL_PATTERN_CHAR_COMPARISON, SINGLE_CHAR_PATTERN]);
7385

7486
const PATTERN_METHODS: [(&str, usize); 22] = [
7587
("contains", 0),
@@ -122,7 +134,7 @@ fn get_char_span<'tcx>(cx: &'_ LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Optio
122134
}
123135
}
124136

125-
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) {
126138
if let ExprKind::Closure(closure) = method_arg.kind
127139
&& let body = cx.tcx.hir().body(closure.body)
128140
&& let Some(PatKind::Binding(_, binding, ..)) = body.params.first().map(|p| p.pat.kind)
@@ -178,6 +190,9 @@ fn check_manual_pattern_char_comparison(cx: &LateContext<'_>, method_arg: &Expr<
178190
{
179191
return;
180192
}
193+
if set_char_spans.len() > 1 && !msrv.meets(msrvs::PATTERN_TRAIT_CHAR_ARRAY) {
194+
return;
195+
}
181196
span_lint_and_then(
182197
cx,
183198
MANUAL_PATTERN_CHAR_COMPARISON,
@@ -221,7 +236,9 @@ impl<'tcx> LateLintPass<'tcx> for StringPatterns {
221236
{
222237
check_single_char_pattern_lint(cx, arg);
223238

224-
check_manual_pattern_char_comparison(cx, arg);
239+
check_manual_pattern_char_comparison(cx, arg, &self.msrv);
225240
}
226241
}
242+
243+
extract_msrv_attr!(LateContext);
227244
}

‎tests/ui/manual_pattern_char_comparison.fixed

+12
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,15 @@ fn main() {
4747
}
4848
"".find(|c| m!(c));
4949
}
50+
51+
#[clippy::msrv = "1.57"]
52+
fn msrv_1_57() {
53+
let sentence = "Hello, world!";
54+
sentence.trim_end_matches(|c: char| c == '.' || c == ',' || c == '!' || c == '?');
55+
}
56+
57+
#[clippy::msrv = "1.58"]
58+
fn msrv_1_58() {
59+
let sentence = "Hello, world!";
60+
sentence.trim_end_matches(['.', ',', '!', '?']);
61+
}

‎tests/ui/manual_pattern_char_comparison.rs

+12
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,15 @@ fn main() {
4747
}
4848
"".find(|c| m!(c));
4949
}
50+
51+
#[clippy::msrv = "1.57"]
52+
fn msrv_1_57() {
53+
let sentence = "Hello, world!";
54+
sentence.trim_end_matches(|c: char| c == '.' || c == ',' || c == '!' || c == '?');
55+
}
56+
57+
#[clippy::msrv = "1.58"]
58+
fn msrv_1_58() {
59+
let sentence = "Hello, world!";
60+
sentence.trim_end_matches(|c: char| c == '.' || c == ',' || c == '!' || c == '?');
61+
}

‎tests/ui/manual_pattern_char_comparison.stderr

+7-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,11 @@ error: this manual char comparison can be written more succinctly
5555
LL | sentence.find(|c| c == '🎈');
5656
| ^^^^^^^^^^^^^ help: consider using a `char`: `'🎈'`
5757

58-
error: aborting due to 9 previous errors
58+
error: this manual char comparison can be written more succinctly
59+
--> tests/ui/manual_pattern_char_comparison.rs:60:31
60+
|
61+
LL | sentence.trim_end_matches(|c: char| c == '.' || c == ',' || c == '!' || c == '?');
62+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using an array of `char`: `['.', ',', '!', '?']`
63+
64+
error: aborting due to 10 previous errors
5965

0 commit comments

Comments
 (0)