Skip to content

Commit ff00e9c

Browse files
borsbors
committed
Auto merge of #11659 - aDotInTheVoid:hexdigit, r=Jarcho
[`manual_is_ascii_check`]: Also check for `is_ascii_hexdigt` changelog: [`manual_is_ascii_check`]: Also check for `is_ascii_hexdigt`
2 parents 929a288 + b5488f9 commit ff00e9c

File tree

4 files changed

+46
-8
lines changed

4 files changed

+46
-8
lines changed

‎clippy_lints/src/manual_is_ascii_check.rs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ use rustc_span::{sym, Span};
1515
declare_clippy_lint! {
1616
/// ### What it does
1717
/// Suggests to use dedicated built-in methods,
18-
/// `is_ascii_(lowercase|uppercase|digit)` for checking on corresponding ascii range
18+
/// `is_ascii_(lowercase|uppercase|digit|hexdigit)` for checking on corresponding
19+
/// ascii range
1920
///
2021
/// ### Why is this bad?
2122
/// Using the built-in functions is more readable and makes it
2223
/// clear that it's not a specific subset of characters, but all
23-
/// ASCII (lowercase|uppercase|digit) characters.
24+
/// ASCII (lowercase|uppercase|digit|hexdigit) characters.
2425
/// ### Example
2526
/// ```rust
2627
/// fn main() {
2728
/// assert!(matches!('x', 'a'..='z'));
2829
/// assert!(matches!(b'X', b'A'..=b'Z'));
2930
/// assert!(matches!('2', '0'..='9'));
3031
/// assert!(matches!('x', 'A'..='Z' | 'a'..='z'));
32+
/// assert!(matches!('C', '0'..='9' | 'a'..='f' | 'A'..='F'));
3133
///
3234
/// ('0'..='9').contains(&'0');
3335
/// ('a'..='z').contains(&'a');
@@ -41,6 +43,7 @@ declare_clippy_lint! {
4143
/// assert!(b'X'.is_ascii_uppercase());
4244
/// assert!('2'.is_ascii_digit());
4345
/// assert!('x'.is_ascii_alphabetic());
46+
/// assert!('C'.is_ascii_hexdigit());
4447
///
4548
/// '0'.is_ascii_digit();
4649
/// 'a'.is_ascii_lowercase();
@@ -75,6 +78,12 @@ enum CharRange {
7578
FullChar,
7679
/// '0..=9'
7780
Digit,
81+
/// 'a..=f'
82+
LowerHexLetter,
83+
/// 'A..=F'
84+
UpperHexLetter,
85+
/// '0..=9' | 'a..=f' | 'A..=F'
86+
HexDigit,
7887
Otherwise,
7988
}
8089

@@ -116,7 +125,8 @@ fn check_is_ascii(cx: &LateContext<'_>, span: Span, recv: &Expr<'_>, range: &Cha
116125
CharRange::LowerChar => Some("is_ascii_lowercase"),
117126
CharRange::FullChar => Some("is_ascii_alphabetic"),
118127
CharRange::Digit => Some("is_ascii_digit"),
119-
CharRange::Otherwise => None,
128+
CharRange::HexDigit => Some("is_ascii_hexdigit"),
129+
CharRange::Otherwise | CharRange::LowerHexLetter | CharRange::UpperHexLetter => None,
120130
} {
121131
let default_snip = "..";
122132
let mut app = Applicability::MachineApplicable;
@@ -141,6 +151,12 @@ fn check_pat(pat_kind: &PatKind<'_>) -> CharRange {
141151

142152
if ranges.len() == 2 && ranges.contains(&CharRange::UpperChar) && ranges.contains(&CharRange::LowerChar) {
143153
CharRange::FullChar
154+
} else if ranges.len() == 3
155+
&& ranges.contains(&CharRange::Digit)
156+
&& ranges.contains(&CharRange::LowerHexLetter)
157+
&& ranges.contains(&CharRange::UpperHexLetter)
158+
{
159+
CharRange::HexDigit
144160
} else {
145161
CharRange::Otherwise
146162
}
@@ -156,6 +172,8 @@ fn check_range(start: &Expr<'_>, end: &Expr<'_>) -> CharRange {
156172
match (&start_lit.node, &end_lit.node) {
157173
(Char('a'), Char('z')) | (Byte(b'a'), Byte(b'z')) => CharRange::LowerChar,
158174
(Char('A'), Char('Z')) | (Byte(b'A'), Byte(b'Z')) => CharRange::UpperChar,
175+
(Char('a'), Char('f')) | (Byte(b'a'), Byte(b'f')) => CharRange::LowerHexLetter,
176+
(Char('A'), Char('F')) | (Byte(b'A'), Byte(b'F')) => CharRange::UpperHexLetter,
159177
(Char('0'), Char('9')) | (Byte(b'0'), Byte(b'9')) => CharRange::Digit,
160178
_ => CharRange::Otherwise,
161179
}

‎tests/ui/manual_is_ascii_check.fixed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,25 @@ fn msrv_1_23() {
3333
assert!(matches!(b'1', b'0'..=b'9'));
3434
assert!(matches!('X', 'A'..='Z'));
3535
assert!(matches!('x', 'A'..='Z' | 'a'..='z'));
36+
assert!(matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F'));
3637
}
3738

3839
#[clippy::msrv = "1.24"]
3940
fn msrv_1_24() {
4041
assert!(b'1'.is_ascii_digit());
4142
assert!('X'.is_ascii_uppercase());
4243
assert!('x'.is_ascii_alphabetic());
44+
assert!('x'.is_ascii_hexdigit());
4345
}
4446

4547
#[clippy::msrv = "1.46"]
4648
fn msrv_1_46() {
4749
const FOO: bool = matches!('x', '0'..='9');
50+
const BAR: bool = matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F');
4851
}
4952

5053
#[clippy::msrv = "1.47"]
5154
fn msrv_1_47() {
5255
const FOO: bool = 'x'.is_ascii_digit();
56+
const BAR: bool = 'x'.is_ascii_hexdigit();
5357
}

‎tests/ui/manual_is_ascii_check.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,25 @@ fn msrv_1_23() {
3333
assert!(matches!(b'1', b'0'..=b'9'));
3434
assert!(matches!('X', 'A'..='Z'));
3535
assert!(matches!('x', 'A'..='Z' | 'a'..='z'));
36+
assert!(matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F'));
3637
}
3738

3839
#[clippy::msrv = "1.24"]
3940
fn msrv_1_24() {
4041
assert!(matches!(b'1', b'0'..=b'9'));
4142
assert!(matches!('X', 'A'..='Z'));
4243
assert!(matches!('x', 'A'..='Z' | 'a'..='z'));
44+
assert!(matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F'));
4345
}
4446

4547
#[clippy::msrv = "1.46"]
4648
fn msrv_1_46() {
4749
const FOO: bool = matches!('x', '0'..='9');
50+
const BAR: bool = matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F');
4851
}
4952

5053
#[clippy::msrv = "1.47"]
5154
fn msrv_1_47() {
5255
const FOO: bool = matches!('x', '0'..='9');
56+
const BAR: bool = matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F');
5357
}

‎tests/ui/manual_is_ascii_check.stderr

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,40 @@ LL | ('A'..='Z').contains(cool_letter);
9898
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `cool_letter.is_ascii_uppercase()`
9999

100100
error: manual check for common ascii range
101-
--> $DIR/manual_is_ascii_check.rs:40:13
101+
--> $DIR/manual_is_ascii_check.rs:41:13
102102
|
103103
LL | assert!(matches!(b'1', b'0'..=b'9'));
104104
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `b'1'.is_ascii_digit()`
105105

106106
error: manual check for common ascii range
107-
--> $DIR/manual_is_ascii_check.rs:41:13
107+
--> $DIR/manual_is_ascii_check.rs:42:13
108108
|
109109
LL | assert!(matches!('X', 'A'..='Z'));
110110
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `'X'.is_ascii_uppercase()`
111111

112112
error: manual check for common ascii range
113-
--> $DIR/manual_is_ascii_check.rs:42:13
113+
--> $DIR/manual_is_ascii_check.rs:43:13
114114
|
115115
LL | assert!(matches!('x', 'A'..='Z' | 'a'..='z'));
116116
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `'x'.is_ascii_alphabetic()`
117117

118118
error: manual check for common ascii range
119-
--> $DIR/manual_is_ascii_check.rs:52:23
119+
--> $DIR/manual_is_ascii_check.rs:44:13
120+
|
121+
LL | assert!(matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F'));
122+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `'x'.is_ascii_hexdigit()`
123+
124+
error: manual check for common ascii range
125+
--> $DIR/manual_is_ascii_check.rs:55:23
120126
|
121127
LL | const FOO: bool = matches!('x', '0'..='9');
122128
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `'x'.is_ascii_digit()`
123129

124-
error: aborting due to 20 previous errors
130+
error: manual check for common ascii range
131+
--> $DIR/manual_is_ascii_check.rs:56:23
132+
|
133+
LL | const BAR: bool = matches!('x', '0'..='9' | 'a'..='f' | 'A'..='F');
134+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `'x'.is_ascii_hexdigit()`
135+
136+
error: aborting due to 22 previous errors
125137

0 commit comments

Comments
 (0)