Rust: Additional test cases.

Author: geoffw0

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

@@ -10,4 +10,14 @@
 | main.rs:223:14:223:16 | val | Variable is not used. |
 | main.rs:225:9:225:12 | None | Variable is not used. |
 | main.rs:234:9:234:12 | None | Variable is not used. |
+| main.rs:240:22:240:24 | val | Variable is not used. |
 | main.rs:248:24:248:26 | val | Variable is not used. |
+| main.rs:257:13:257:15 | num | Variable is not used. |
+| main.rs:268:9:268:11 | Yes | Variable is not used. |
+| main.rs:269:9:269:10 | No | Variable is not used. |
+| main.rs:272:12:272:12 | j | Variable is not used. |
+| main.rs:290:25:290:25 | y | Variable is not used. |
+| main.rs:294:28:294:28 | a | Variable is not used. |
+| main.rs:298:9:298:9 | p | Variable is not used. |
+| main.rs:305:13:305:13 | y | Variable is not used. |
+| main.rs:313:21:313:21 | y | Variable is not used. |

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

@@ -189,12 +189,12 @@ enum YesOrNo {
     No,
 }
 
+use YesOrNo::{Yes, No}; // allows `Yes`, `No` to be accessed without qualifiers.
 
-
-
-
-
-
+struct MyPoint {
+    x: i64,
+    y: i64,
+}
 
 fn if_lets_matches() {
     let mut total: i64 = 0;
@@ -235,13 +235,13 @@ fn if_lets_matches() {
         }
     }
 
-
-
-
-
-
-
-
+    let e = Option::Some(80);
+    match e {
+        Option::Some(val) => { // BAD: unused variable
+        }
+        Option::None => {
+        }
+    }
 
     let f = MyOption::Some(90);
     match f {
@@ -250,24 +250,72 @@ fn if_lets_matches() {
         MyOption::None => {}
     }
 
-
-
-
-
-
-
+    let g : Result<i64, i64> = Ok(100);
+    match g {
+        Ok(_) => {
+        }
+        Err(num) => {} // BAD: unused variable
+    }
 
     let h = YesOrNo::Yes;
     match h {
         YesOrNo::Yes => {}
         YesOrNo::No => {}
     }
 
+    let i = Yes;
+    match i {
+        Yes => {} // SPURIOUS: unused variable 'None'
+        No => {} // SPURIOUS: unused variable 'None'
+    }
 
+    if let j = Yes { // BAD: unused variable
+    }
 
+    if let k = Yes {
+        match k {
+            _ => {}
+        }
+    }
 
+    match 1 {
+        1 => {}
+        _ => {}
+    }
 
+    let p1 = MyPoint { x: 1, y: 2 };
+    match p1 {
+        MyPoint { x: 0, y: 0 } => {
+        }
+        MyPoint { x: 1, y } => { // BAD: unused variable
+        }
+        MyPoint { x: 2, y: _ } => {
+        }
+        MyPoint { x: 3, y: a } => { // BAD: unused variable
+        }
+        MyPoint { x: 4, .. } => {
+        }
+        p => { // BAD: unused variable
+        }
+    }
+}
+
+fn shadowing() -> i32 {
+    let x = 1; // BAD: unused value [NOT DETECTED]
+    let mut y: i32; // BAD: unused variable
 
+    {
+        let x = 2;
+        let mut y: i32;
+
+        {
+            let x = 3; // BAD: unused value [NOT DETECTED]
+            let mut y: i32; // BAD: unused variable
+        }
+
+        y = x;
+        return y;
+    }
 }
 
 fn main() {
@@ -278,6 +326,7 @@ fn main() {
     statics();
     loops();
     if_lets_matches();
+    shadowing();
 
     println!("lets use result {}", parameters(1, 2, 3));
 }