Rust: Add a few more macro tests.

Author: geoffw0

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

@@ -14,8 +14,9 @@
 | main.rs:284:13:284:17 | total | Variable $@ is assigned a value that is never used. | main.rs:252:13:252:17 | total | total |
 | main.rs:377:9:377:9 | x | Variable $@ is assigned a value that is never used. | main.rs:377:9:377:9 | x | x |
 | main.rs:385:17:385:17 | x | Variable $@ is assigned a value that is never used. | main.rs:385:17:385:17 | x | x |
-| main.rs:493:9:493:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:493:9:493:20 | var_in_macro | var_in_macro |
-| main.rs:502:9:502:9 | c | Variable $@ is assigned a value that is never used. | main.rs:502:9:502:9 | c | c |
+| main.rs:510:9:510:9 | d | Variable $@ is assigned a value that is never used. | main.rs:510:9:510:9 | d | d |
+| main.rs:550:9:550:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:550:9:550:20 | var_in_macro | var_in_macro |
+| main.rs:559:9:559:9 | c | Variable $@ is assigned a value that is never used. | main.rs:559:9:559:9 | c | c |
 | more.rs:44:9:44:14 | a_ptr4 | Variable $@ is assigned a value that is never used. | more.rs:44:9:44:14 | a_ptr4 | a_ptr4 |
 | more.rs:59:9:59:13 | d_ptr | Variable $@ is assigned a value that is never used. | more.rs:59:9:59:13 | d_ptr | d_ptr |
 | more.rs:65:13:65:17 | f_ptr | Variable $@ is assigned a value that is never used. | more.rs:65:13:65:17 | f_ptr | f_ptr |

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

@@ -19,4 +19,5 @@
 | main.rs:431:26:431:28 | val | Variable 'val' is not used. |
 | main.rs:434:21:434:23 | acc | Variable 'acc' is not used. |
 | main.rs:455:9:455:14 | unused | Variable 'unused' is not used. |
+| main.rs:521:12:521:12 | n | Variable 'n' is not used. |
 | more.rs:24:9:24:11 | val | Variable 'val' is not used. |

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

@@ -468,15 +468,72 @@ fn traits() {
 
 // --- macros ---
 
-fn macros() {
+macro_rules! set_value {
+    ($x:expr,$y:expr) => {
+        $x = $y
+    };
+}
+
+macro_rules! use_value {
+    ($x:expr) => {
+        println!("{}", $x)
+    };
+}
+
+fn macros1() {
+    let a: u16;
+    let b: u16 = 2;
+    set_value!(a, 1);
+    use_value!(b);
+
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            use_value!(n);
+        }
+        _ => {}
+    }
+}
+
+fn macros2() {
+    let a: u16 = 3;
+    println!("{}", a);
+
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            println!("{}", n);
+        }
+        _ => {}
+    }
+}
+
+fn macros3() {
+    let d: u16 = 4; // $ SPURIOUS: Alert[rust/unused-value]
+
+    undefined_macro_call!(d);
+}
+
+fn macros4() {
+    undefined_macro_call!(5);
+}
+
+fn macros5() {
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => { // $ SPURIOUS: Alert[rust/unused-variable]
+            undefined_macro_call!(n);
+        }
+        _ => {}
+    }
+}
+
+fn macros6() {
     let x;
     println!(
         "The value of x is {}",
         ({
             x = 10; // $ MISSING: Alert[rust/unused-value]
             10
         })
-    )
+    );
 }
 
 macro_rules! let_in_macro {
@@ -535,7 +592,12 @@ fn main() {
     shadowing();
     func_ptrs();
     folds_and_closures();
-    macros();
+    macros1();
+    macros2();
+    macros3();
+    macros4();
+    macros5();
+    macros6();
     hygiene_mismatch();
     references();
 

rust/ql/test/query-tests/unusedentities/options.yml

@@ -0,0 +1 @@
+qltest_cargo_check: false