Rust: Move the undefined_macros test cases to their own subdirectory.

Author: geoffw0

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

@@ -14,8 +14,8 @@
 | 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:556:9:556:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:556:9:556:20 | var_in_macro | var_in_macro |
-| main.rs:565:9:565:9 | c | Variable $@ is assigned a value that is never used. | main.rs:565:9:565:9 | c | c |
+| main.rs:531:9:531:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:531:9:531:20 | var_in_macro | var_in_macro |
+| main.rs:540:9:540:9 | c | Variable $@ is assigned a value that is never used. | main.rs:540:9:540: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/main.rs

@@ -507,31 +507,6 @@ fn macros2() {
 }
 
 fn macros3() {
-    let d: u16 = 4;
-
-    undefined_macro_call!(d);
-}
-
-fn macros4() {
-    {
-        let a: u16 = 6; // $ MISSING: Alert[rust/unused-variable]
-    }
-
-    undefined_macro_call!(5);
-
-    let b: u16 = 6; // $ MISSING: Alert[rust/unused-variable]
-}
-
-fn macros5() {
-    match std::env::args().nth(1).unwrap().parse::<u16>() {
-        Ok(n) => {
-            undefined_macro_call!(n);
-        }
-        _ => {}
-    }
-}
-
-fn macros6() {
     let x;
     println!(
         "The value of x is {}",
@@ -601,9 +576,6 @@ fn main() {
     macros1();
     macros2();
     macros3();
-    macros4();
-    macros5();
-    macros6();
     hygiene_mismatch();
     references();
 

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

@@ -0,0 +1,2 @@
+query: queries/unusedentities/UnusedVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

rust/ql/test/query-tests/unusedentities/undefined_macros/UnusedVariable.qlref

@@ -0,0 +1,33 @@
+
+// --- undefined macro calls ---
+
+fn undefined_macros1() {
+    let d: u16 = 4;
+
+    undefined_macro_call!(d);
+}
+
+fn undefined_macros2() {
+    {
+        let a: u16 = 6; // $ MISSING: Alert[rust/unused-variable]
+    }
+
+    undefined_macro_call!(5);
+
+    let b: u16 = 6; // $ MISSING: Alert[rust/unused-variable]
+}
+
+fn undefined_macros3() {
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            undefined_macro_call!(n);
+        }
+        _ => {}
+    }
+}
+
+fn main() {
+    undefined_macros1();
+    undefined_macros2();
+    undefined_macros3();
+}