Rust: Make it so that all of the test functions may return.

Author: geoffw0

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

@@ -3,14 +3,14 @@
 | unreachable.rs:39:9:39:23 | ExprStmt | This code is never reached. |
 | unreachable.rs:46:9:46:23 | ExprStmt | This code is never reached. |
 | unreachable.rs:67:5:67:19 | ExprStmt | This code is never reached. |
-| unreachable.rs:114:13:114:20 | MacroExpr | This code is never reached. |
-| unreachable.rs:123:13:123:20 | MacroExpr | This code is never reached. |
-| unreachable.rs:149:5:149:19 | ExprStmt | This code is never reached. |
-| unreachable.rs:156:9:156:23 | ExprStmt | This code is never reached. |
-| unreachable.rs:165:13:165:27 | ExprStmt | This code is never reached. |
-| unreachable.rs:171:9:171:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:134:13:134:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:143:13:143:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:169:5:169:19 | ExprStmt | This code is never reached. |
 | unreachable.rs:177:13:177:27 | ExprStmt | This code is never reached. |
-| unreachable.rs:185:13:185:27 | ExprStmt | This code is never reached. |
-| unreachable.rs:188:5:188:19 | ExprStmt | This code is never reached. |
-| unreachable.rs:212:9:212:23 | ExprStmt | This code is never reached. |
-| unreachable.rs:228:9:228:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:187:13:187:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:193:9:193:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:200:17:200:31 | ExprStmt | This code is never reached. |
+| unreachable.rs:210:17:210:31 | ExprStmt | This code is never reached. |
+| unreachable.rs:213:9:213:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:238:9:238:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:254:9:254:23 | ExprStmt | This code is never reached. |

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

@@ -483,9 +483,9 @@ fn main() {
     unreachable_if_1();
     unreachable_if_2();
     unreachable_if_3();
-    // unreachable_panic();
+    unreachable_panic();
     unreachable_match();
-    // unreachable_loop();
+    unreachable_loop();
     unreachable_paren();
     unreachable_let_1();
     unreachable_let_2();

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

@@ -170,10 +170,12 @@ pub fn unreachable_match() {
 }
 
 pub fn unreachable_loop() {
-    loop {
-        do_something();
-        break;
-        do_something(); // $ Alert[rust/dead-code]
+    if cond() {
+        loop {
+            do_something();
+            break;
+            do_something(); // $ Alert[rust/dead-code]
+        }
     }
 
     if cond() {
@@ -191,23 +193,27 @@ pub fn unreachable_loop() {
         do_something(); // $ Alert[rust/dead-code]
     }
 
-    for _ in 1..10 {
-        if cond() {
-            continue;
-            do_something(); // $ Alert[rust/dead-code]
+    if cond() {
+        for _ in 1..10 {
+            if cond() {
+                continue;
+                do_something(); // $ Alert[rust/dead-code]
+            }
+            do_something();
         }
-        do_something();
     }
 
-    loop {
-        if cond() {
-            return;
-            do_something(); // $ Alert[rust/dead-code]
+    if cond() {
+        loop {
+            if cond() {
+                return;
+                do_something(); // $ Alert[rust/dead-code]
+            }
         }
+        do_something(); // $ Alert[rust/dead-code]
+        do_something();
+        do_something();
     }
-    do_something(); // $ Alert[rust/dead-code]
-    do_something();
-    do_something();
 }
 
 pub fn unreachable_paren() {