Rust: Test spacing / variable names.

Author: geoffw0

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

@@ -5,9 +5,9 @@
 | main.rs:164:9:164:9 | x | Variable is not used. |
 | main.rs:169:9:169:9 | x | Variable is not used. |
 | main.rs:174:9:174:9 | x | Variable is not used. |
-| main.rs:195:17:195:17 | a | Variable is not used. |
-| main.rs:203:20:203:22 | val | Variable is not used. |
-| main.rs:216:14:216:16 | val | Variable is not used. |
-| main.rs:218:9:218:12 | None | Variable is not used. |
-| main.rs:227:9:227:12 | None | Variable is not used. |
-| main.rs:233:24:233:26 | val | Variable is not used. |
+| main.rs:202:17:202:17 | a | Variable is not used. |
+| main.rs:210:20:210:22 | val | Variable is not used. |
+| 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:248:24:248:26 | val | Variable is not used. |

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

@@ -167,12 +167,12 @@ fn loops() {
     for _ in 1..10 {}
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {    
+    in 1..10 {
         println!("x is {}", x);
     }
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {   
+    in 1..10 {
         assert!(x != 11);
     }
 }
@@ -189,7 +189,14 @@ enum YesOrNo {
     No,
 }
 
-fn if_lets() {
+
+
+
+
+
+
+
+fn if_lets_matches() {
     let mut total: i64 = 0;
 
     if let Some(a) = Some(10) { // BAD: unused variable
@@ -228,18 +235,39 @@ fn if_lets() {
         }
     }
 
-    let e = MyOption::Some(80);
-    match e {
+
+
+
+
+
+
+
+
+    let f = MyOption::Some(90);
+    match f {
         MyOption::Some(val) => { // BAD: unused variable
         }
         MyOption::None => {}
     }
 
-    let f = YesOrNo::Yes;
-    match f {
+
+
+
+
+
+
+
+    let h = YesOrNo::Yes;
+    match h {
         YesOrNo::Yes => {}
         YesOrNo::No => {}
     }
+
+
+
+
+
+
 }
 
 fn main() {
@@ -249,7 +277,7 @@ fn main() {
     arrays();
     statics();
     loops();
-    if_lets();
+    if_lets_matches();
 
     println!("lets use result {}", parameters(1, 2, 3));
 }