Skip to content

Commit 74df0f2

Browse files
committed
fix rustfix tests
1 parent 06fd3a7 commit 74df0f2

5 files changed

+229
-135
lines changed
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
//@run-rustfix
2+
3+
#![allow(unused)]
4+
#![warn(clippy::missing_assert_for_indexing)]
5+
6+
// ok
7+
fn sum_with_assert(v: &[u8]) -> u8 {
8+
assert!(v.len() > 4);
9+
v[0] + v[1] + v[2] + v[3] + v[4]
10+
}
11+
12+
// ok
13+
fn sum_with_assert_other_way(v: &[u8]) -> u8 {
14+
assert!(5 <= v.len());
15+
v[0] + v[1] + v[2] + v[3] + v[4]
16+
}
17+
18+
// ok
19+
fn sum_with_assert_ge(v: &[u8]) -> u8 {
20+
assert!(v.len() >= 5);
21+
v[0] + v[1] + v[2] + v[3] + v[4]
22+
}
23+
24+
// ok
25+
fn sum_with_assert_ge_other_way(v: &[u8]) -> u8 {
26+
assert!(4 < v.len());
27+
v[0] + v[1] + v[2] + v[3] + v[4]
28+
}
29+
30+
fn sum_with_assert_lt(v: &[u8]) -> u8 {
31+
assert!(v.len() > 4);
32+
//~^ ERROR incorrect length
33+
v[0] + v[1] + v[2] + v[3] + v[4]
34+
}
35+
36+
fn sum_with_assert_le(v: &[u8]) -> u8 {
37+
assert!(v.len() > 4);
38+
//~^ ERROR incorrect length
39+
v[0] + v[1] + v[2] + v[3] + v[4]
40+
}
41+
42+
fn sum_with_incorrect_assert_len(v: &[u8]) -> u8 {
43+
assert!(v.len() > 4);
44+
//~^ ERROR incorrect length
45+
v[0] + v[1] + v[2] + v[3] + v[4]
46+
}
47+
48+
fn sum_with_incorrect_assert_len2(v: &[u8]) -> u8 {
49+
assert!(v.len() > 4);
50+
//~^ ERROR incorrect length
51+
v[0] + v[1] + v[2] + v[3] + v[4]
52+
}
53+
54+
// ok, don't lint for single array access
55+
fn single_access(v: &[u8]) -> u8 {
56+
v[0]
57+
}
58+
59+
// ok
60+
fn subslice_ok(v: &[u8]) {
61+
assert!(v.len() > 3);
62+
let _ = v[0];
63+
let _ = v[1..4];
64+
}
65+
66+
fn subslice_bad(v: &[u8]) {
67+
assert!(v.len() > 3);
68+
//~^ ERROR incorrect length
69+
let _ = v[0];
70+
let _ = v[1..4];
71+
}
72+
73+
// ok
74+
fn subslice_inclusive_ok(v: &[u8]) {
75+
assert!(v.len() > 4);
76+
let _ = v[0];
77+
let _ = v[1..=4];
78+
}
79+
80+
fn subslice_inclusive_bad(v: &[u8]) {
81+
assert!(v.len() > 4);
82+
//~^ ERROR incorrect length
83+
let _ = v[0];
84+
let _ = v[1..=4];
85+
}
86+
87+
fn main() {}

tests/ui/missing_assert_for_indexing.rs

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
// run-rustfix
1+
//@run-rustfix
22

33
#![allow(unused)]
44
#![warn(clippy::missing_assert_for_indexing)]
55

6-
fn sum(v: &[u8]) -> u8 {
7-
//~^ ERROR missing assertions on `v.len()`
8-
v[0] + v[1] + v[2] + v[3] + v[4]
9-
}
10-
116
// ok
127
fn sum_with_assert(v: &[u8]) -> u8 {
138
assert!(v.len() > 4);
@@ -26,7 +21,7 @@ fn sum_with_assert_ge(v: &[u8]) -> u8 {
2621
v[0] + v[1] + v[2] + v[3] + v[4]
2722
}
2823

29-
// ok, but fails right now
24+
// ok
3025
fn sum_with_assert_ge_other_way(v: &[u8]) -> u8 {
3126
assert!(4 < v.len());
3227
v[0] + v[1] + v[2] + v[3] + v[4]
@@ -61,12 +56,6 @@ fn single_access(v: &[u8]) -> u8 {
6156
v[0]
6257
}
6358

64-
fn subslice(v: &[u8]) {
65-
//~^ ERROR missing assertion on `v.len()`
66-
let _ = v[0];
67-
let _ = v[1..4];
68-
}
69-
7059
// ok
7160
fn subslice_ok(v: &[u8]) {
7261
assert!(v.len() > 3);
@@ -95,12 +84,4 @@ fn subslice_inclusive_bad(v: &[u8]) {
9584
let _ = v[1..=4];
9685
}
9786

98-
fn variables(v: &[u8]) -> u8 {
99-
//~^ ERROR missing assertions on `v.len()`
100-
let a = v[0];
101-
let b = v[1];
102-
let c = v[2];
103-
a + b + c
104-
}
105-
10687
fn main() {}

0 commit comments

Comments
 (0)