Skip to content

Commit 6a84ef8

Browse files
committed
Update ui test and stderr
1 parent c20179e commit 6a84ef8

File tree

2 files changed

+15
-22
lines changed

2 files changed

+15
-22
lines changed

tests/ui/use_last.rs

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,29 @@
11
#![warn(clippy::use_last)]
22

3-
fn dont_use_last() -> Option<i32> {
3+
fn dont_use_last() {
44
let x = vec![2, 3, 5];
5-
let last_element = x.get(x.len() - 1); // ~ERROR Use x.last()
6-
last_element.map(|val| val + 1) // To avoid warnings
5+
let _ = x.get(x.len() - 1); // ~ERROR Use x.last()
76
}
87

9-
fn indexing_two_from_end() -> Option<i32> {
8+
fn indexing_two_from_end() {
109
let x = vec![2, 3, 5];
11-
let last_element = x.get(x.len() - 2);
12-
last_element.map(|val| val + 3) // To avoid warnings
10+
let _ = x.get(x.len() - 2);
1311
}
1412

15-
fn index_into_last() -> i32 {
13+
fn index_into_last() {
1614
let x = vec![2, 3, 5];
17-
let last_element = x[x.len() - 1];
18-
last_element + 1 // To avoid warnings
15+
let _ = x[x.len() - 1];
1916
}
2017

21-
// False positive test (currently failing)
22-
fn use_last_with_different_vec_length() -> Option<i32> {
18+
fn use_last_with_different_vec_length() {
2319
let x = vec![2, 3, 5];
2420
let y = vec!['a', 'b', 'c'];
25-
let last_element = x.get(y.len() - 1);
26-
last_element.map(|val| val + 1)
21+
let _ = x.get(y.len() - 1);
2722
}
2823

2924
fn main() {
30-
let expected_value: i32 = 6;
31-
println!("Working...");
32-
assert_eq!(dont_use_last(), Some(expected_value));
33-
assert_eq!(indexing_two_from_end(), Some(expected_value));
34-
assert_eq!(index_into_last(), expected_value);
35-
assert_eq!(use_last_with_different_vec_length(), Some(expected_value));
25+
dont_use_last();
26+
indexing_two_from_end();
27+
index_into_last();
28+
use_last_with_different_vec_length();
3629
}

tests/ui/use_last.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Use `x.last()` instead of `x.get(x.len() - 1)`
2-
--> $DIR/use_last.rs:5:24
2+
--> $DIR/use_last.rs:5:13
33
|
4-
LL | let last_element = x.get(x.len() - 1); // ~ERROR Use x.last()
5-
| ^^^^^^^^^^^^^^^^^^ help: try: `x.last()`
4+
LL | let _ = x.get(x.len() - 1); // ~ERROR Use x.last()
5+
| ^^^^^^^^^^^^^^^^^^ help: try: `x.last()`
66
|
77
= note: `-D clippy::use-last` implied by `-D warnings`
88

0 commit comments

Comments
 (0)