Rust: Accept test changes after merging main.

Author: geoffw0

rust/ql/test/query-tests/unusedentities/UnreachableCode.expected

@@ -1,16 +1,26 @@
-| main.rs:114:3:114:29 | ExprStmt | This code is never reached. |
+| main.rs:216:9:217:9 | MatchArm | This code is never reached. |
+| main.rs:218:9:219:9 | MatchArm | This code is never reached. |
+| main.rs:224:9:226:9 | MatchArm | This code is never reached. |
+| main.rs:227:9:228:9 | MatchArm | This code is never reached. |
+| main.rs:233:9:234:9 | MatchArm | This code is never reached. |
+| main.rs:235:9:235:28 | MatchArm | This code is never reached. |
+| main.rs:240:9:240:26 | MatchArm | This code is never reached. |
+| main.rs:241:9:241:25 | MatchArm | This code is never reached. |
+| unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:48:2:48:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:89:3:89:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:97:3:97:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:105:3:107:3 | MatchArm | This code is never reached. |
 | unreachable.rs:108:3:110:3 | MatchArm | This code is never reached. |
 | unreachable.rs:112:2:112:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:115:3:117:3 | MatchArm | This code is never reached. |
 | unreachable.rs:118:3:120:3 | MatchArm | This code is never reached. |
 | unreachable.rs:122:2:122:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:129:3:129:17 | ExprStmt | This code is never reached. |
-| unreachable.rs:134:4:134:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:138:4:138:18 | ExprStmt | This code is never reached. |
-| unreachable.rs:142:4:142:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:144:3:144:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
 | unreachable.rs:153:2:153:16 | ExprStmt | This code is never reached. |

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

@@ -111,7 +111,7 @@ fn arrays() {
 
     println!("lets use {:?}", js);
 
-    for k // SPURIOUS: unused variable [macros not yet supported]
+    for k
 	in ks
 	{
         println!("lets use {}", k); // [unreachable FALSE POSITIVE]
@@ -213,32 +213,32 @@ fn if_lets() {
 
     let c = Some(60);
     match c {
-        Some(val) => { // BAD: unused variable
+        Some(val) => { // BAD: unused variable SPURIOUS: unreachable
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => { // SPURIOUS: unused variable 'None', unreachable
         }
     }
 
     let d = Some(70);
     match d {
-        Some(val) => {
+        Some(val) => { // SPURIOUS: unreachable
             total += val;
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => { // SPURIOUS: unused variable 'None', unreachable
         }
     }
 
     let e = MyOption::Some(80);
     match e {
-        MyOption::Some(val) => { // BAD: unused variable
+        MyOption::Some(val) => { // BAD: unused variable, unreachable
         }
-        MyOption::None => {}
+        MyOption::None => {} // SPURIOUS: unreachable
     }
 
     let f = YesOrNo::Yes;
     match f {
-        YesOrNo::Yes => {}
-        YesOrNo::No => {}
+        YesOrNo::Yes => {} // SPURIOUS: unreachable
+        YesOrNo::No => {} // SPURIOUS: unreachable
     }
 }
 

rust/ql/test/query-tests/unusedentities/unreachable.rs

@@ -9,15 +9,15 @@ fn do_something() {
 
 fn unreachable_if() {
 	if false {
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	} else {
 		do_something();
 	}
 
 	if true {
 		do_something();
 	} else {
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	let v = get_a_number();
@@ -86,15 +86,15 @@ fn unreachable_panic() {
 	if cond() {
 		do_something();
 		_ = false && panic!(); // does not panic due to short-circuiting
-		do_something();
+		do_something(); // SPURIOUS: unreachable
 		_ = false || panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
 
 	if cond() {
 		do_something();
 		_ = true || panic!(); // does not panic due to short-circuiting
-		do_something();
+		do_something(); // SPURIOUS: unreachable
 		_ = true && panic!();
 		do_something(); // BAD: unreachable code [NOT DETECTED]
 	}
@@ -131,17 +131,17 @@ fn unreachable_loop() {
 
 	if cond() {
 		while cond() {
-			do_something();{ // [unreachable FALSE POSITIVE]
+			do_something();{
 		}
 
 		while false {
 			do_something(); // BAD: unreachable code
 		}
 
 		while true {
-			do_something(); // [unreachable FALSE POSITIVE]
+			do_something();
 		}
-		do_something(); // BAD: unreachable code [NOT DETECTED]
+		do_something(); // BAD: unreachable code
 	}
 
 	loop {