Skip to content

Commit 84a74d9

Browse files
geoffw0geoffw0
committed
Rust: Fixup after merging main.
1 parent 88f6d3b commit 84a74d9

File tree

3 files changed

+28
-36
lines changed

3 files changed

+28
-36
lines changed

‎rust/ql/test/query-tests/unusedentities/UnusedValue.expected

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
| main.rs:87:9:87:9 | a | Variable is assigned a value that is never used. |
1212
| main.rs:108:9:108:10 | is | Variable is assigned a value that is never used. |
1313
| main.rs:133:13:133:17 | total | Variable is assigned a value that is never used. |
14-
| main.rs:232:13:232:17 | total | Variable is assigned a value that is never used. |
15-
| main.rs:301:9:301:9 | x | Variable is assigned a value that is never used. |
16-
| main.rs:309:17:309:17 | x | Variable is assigned a value that is never used. |
14+
| main.rs:203:13:203:31 | res | Variable is assigned a value that is never used. |
15+
| main.rs:218:9:218:24 | kind | Variable is assigned a value that is never used. |
16+
| main.rs:223:9:223:32 | kind | Variable is assigned a value that is never used. |
17+
| main.rs:280:13:280:17 | total | Variable is assigned a value that is never used. |
18+
| main.rs:348:5:348:39 | kind | Variable is assigned a value that is never used. |
19+
| main.rs:370:9:370:9 | x | Variable is assigned a value that is never used. |
20+
| main.rs:378:17:378:17 | x | Variable is assigned a value that is never used. |
21+
| main.rs:432:9:432:10 | i6 | Variable is assigned a value that is never used. |

‎rust/ql/test/query-tests/unusedentities/UnusedVariable.expected

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,17 @@
66
| main.rs:201:9:201:9 | x | Variable is not used. |
77
| main.rs:250:17:250:17 | a | Variable is not used. |
88
| main.rs:258:20:258:22 | val | Variable is not used. |
9-
| main.rs:271:14:271:16 | val | Variable is not used. |
10-
| main.rs:288:22:288:24 | val | Variable is not used. |
11-
| main.rs:296:24:296:26 | val | Variable is not used. |
12-
| main.rs:305:13:305:15 | num | Variable is not used. |
13-
| main.rs:320:12:320:12 | j | Variable is not used. |
14-
| main.rs:342:25:342:25 | y | Variable is not used. |
15-
| main.rs:346:28:346:28 | a | Variable is not used. |
16-
| main.rs:350:9:350:9 | p | Variable is not used. |
17-
| main.rs:365:9:365:13 | right | Variable is not used. |
18-
| main.rs:371:9:371:14 | right2 | Variable is not used. |
19-
| main.rs:378:13:378:13 | y | Variable is not used. |
20-
| main.rs:386:21:386:21 | y | Variable is not used. |
21-
| main.rs:434:27:434:29 | val | Variable is not used. |
22-
| main.rs:437:22:437:24 | acc | Variable is not used. |
23-
| main.rs:164:9:164:9 | x | Variable is not used. |
24-
| main.rs:202:17:202:17 | a | Variable is not used. |
25-
| main.rs:210:20:210:22 | val | Variable is not used. |
26-
| main.rs:224:14:224:16 | val | Variable is not used. |
27-
| main.rs:239:22:239:24 | val | Variable is not used. |
28-
| main.rs:246:24:246:26 | val | Variable is not used. |
29-
| main.rs:254:13:254:15 | num | Variable is not used. |
30-
| main.rs:269:12:269:12 | j | Variable is not used. |
31-
| main.rs:289:25:289:25 | y | Variable is not used. |
32-
| main.rs:292:28:292:28 | a | Variable is not used. |
33-
| main.rs:295:9:295:9 | p | Variable is not used. |
34-
| main.rs:302:13:302:13 | y | Variable is not used. |
35-
| main.rs:310:21:310:21 | y | Variable is not used. |
9+
| main.rs:272:14:272:16 | val | Variable is not used. |
10+
| main.rs:287:22:287:24 | val | Variable is not used. |
11+
| main.rs:294:24:294:26 | val | Variable is not used. |
12+
| main.rs:302:13:302:15 | num | Variable is not used. |
13+
| main.rs:317:12:317:12 | j | Variable is not used. |
14+
| main.rs:337:25:337:25 | y | Variable is not used. |
15+
| main.rs:340:28:340:28 | a | Variable is not used. |
16+
| main.rs:343:9:343:9 | p | Variable is not used. |
17+
| main.rs:358:9:358:13 | right | Variable is not used. |
18+
| main.rs:364:9:364:14 | right2 | Variable is not used. |
19+
| main.rs:371:13:371:13 | y | Variable is not used. |
20+
| main.rs:379:21:379:21 | y | Variable is not used. |
21+
| main.rs:427:27:427:29 | val | Variable is not used. |
22+
| main.rs:430:22:430:24 | acc | Variable is not used. |

‎rust/ql/test/query-tests/unusedentities/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn structs() {
105105
// --- arrays ---
106106

107107
fn arrays() {
108-
let is = [1, 2, 3]; // BAD: unused values (x3)
108+
let is = [1, 2, 3]; // BAD: unused value
109109
let js = [1, 2, 3];
110110
let ks = [1, 2, 3];
111111

@@ -200,7 +200,7 @@ fn loops() {
200200

201201
for x // SPURIOUS: unused variable
202202
in 1..10 {
203-
_ = format!("x is {x}");
203+
_ = format!("x is {x}"); // SPURIOUS: unused value `res`
204204
}
205205

206206
for x
@@ -215,12 +215,12 @@ fn loops() {
215215

216216
for x
217217
in 1..10 {
218-
assert_eq!(x, 1);
218+
assert_eq!(x, 1); // SPURIOUS: unused value `kind`
219219
}
220220

221221
for x
222222
in 1..10 {
223-
assert_eq!(id(x), id(1));
223+
assert_eq!(id(x), id(1)); // SPURIOUS: unused value `kind`
224224
}
225225

226226
}
@@ -345,7 +345,7 @@ fn if_lets_matches() {
345345
}
346346

347347
let duration1 = std::time::Duration::new(10, 0); // ten seconds
348-
assert_eq!(duration1.as_secs(), 10);
348+
assert_eq!(duration1.as_secs(), 10); // SPURIOUS: unused value `kind`
349349

350350
let duration2:Result<std::time::Duration, String> =
351351
Ok(std::time::Duration::new(10, 0));
@@ -429,7 +429,7 @@ fn folds_and_closures() {
429429
let a5 = 1..10;
430430
_ = a5.fold(0, | acc, val | val); // BAD: unused variable
431431

432-
let i6 = 1;
432+
let i6 = 1; // SPURIOUS: unused value
433433
let a6 = 1..10;
434434
_ = a6.fold(0, | acc, val | acc + val + i6);
435435
}

0 commit comments

Comments
 (0)