Rust: Update expected files

Author: paldepind

rust/ql/test/library-tests/dataflow/global/inline-flow.expected

@@ -184,10 +184,13 @@ edges
 | main.rs:306:30:306:56 | ...::take_second(...) [MyInt] | main.rs:306:9:306:26 | MyInt {...} [MyInt] | provenance |  |
 | main.rs:306:55:306:55 | b [MyInt] | main.rs:293:26:293:37 | ...: MyInt [MyInt] | provenance |  |
 | main.rs:306:55:306:55 | b [MyInt] | main.rs:306:30:306:56 | ...::take_second(...) [MyInt] | provenance |  |
+| main.rs:315:32:319:1 | { ... } | main.rs:322:13:322:26 | async_source(...) | provenance |  |
 | main.rs:315:32:319:1 | { ... } | main.rs:334:41:334:54 | async_source(...) | provenance |  |
 | main.rs:316:9:316:9 | a | main.rs:315:32:319:1 | { ... } | provenance |  |
 | main.rs:316:9:316:9 | a | main.rs:317:10:317:10 | a | provenance |  |
 | main.rs:316:13:316:21 | source(...) | main.rs:316:9:316:9 | a | provenance |  |
+| main.rs:322:9:322:9 | a | main.rs:323:10:323:10 | a | provenance |  |
+| main.rs:322:13:322:26 | async_source(...) | main.rs:322:9:322:9 | a | provenance |  |
 | main.rs:326:13:326:13 | c | main.rs:327:14:327:14 | c | provenance |  |
 | main.rs:326:17:326:25 | source(...) | main.rs:326:13:326:13 | c | provenance |  |
 | main.rs:334:9:334:9 | a | main.rs:335:10:335:10 | a | provenance |  |
@@ -417,6 +420,9 @@ nodes
 | main.rs:316:9:316:9 | a | semmle.label | a |
 | main.rs:316:13:316:21 | source(...) | semmle.label | source(...) |
 | main.rs:317:10:317:10 | a | semmle.label | a |
+| main.rs:322:9:322:9 | a | semmle.label | a |
+| main.rs:322:13:322:26 | async_source(...) | semmle.label | async_source(...) |
+| main.rs:323:10:323:10 | a | semmle.label | a |
 | main.rs:326:13:326:13 | c | semmle.label | c |
 | main.rs:326:17:326:25 | source(...) | semmle.label | source(...) |
 | main.rs:327:14:327:14 | c | semmle.label | c |
@@ -500,6 +506,7 @@ testFailures
 | main.rs:302:10:302:10 | c | main.rs:299:28:299:36 | source(...) | main.rs:302:10:302:10 | c | $@ | main.rs:299:28:299:36 | source(...) | source(...) |
 | main.rs:307:10:307:10 | c | main.rs:305:28:305:37 | source(...) | main.rs:307:10:307:10 | c | $@ | main.rs:305:28:305:37 | source(...) | source(...) |
 | main.rs:317:10:317:10 | a | main.rs:316:13:316:21 | source(...) | main.rs:317:10:317:10 | a | $@ | main.rs:316:13:316:21 | source(...) | source(...) |
+| main.rs:323:10:323:10 | a | main.rs:316:13:316:21 | source(...) | main.rs:323:10:323:10 | a | $@ | main.rs:316:13:316:21 | source(...) | source(...) |
 | main.rs:327:14:327:14 | c | main.rs:326:17:326:25 | source(...) | main.rs:327:14:327:14 | c | $@ | main.rs:326:17:326:25 | source(...) | source(...) |
 | main.rs:335:10:335:10 | a | main.rs:316:13:316:21 | source(...) | main.rs:335:10:335:10 | a | $@ | main.rs:316:13:316:21 | source(...) | source(...) |
 | main.rs:384:14:384:15 | n1 | main.rs:359:13:359:21 | source(...) | main.rs:384:14:384:15 | n1 | $@ | main.rs:359:13:359:21 | source(...) | source(...) |

rust/ql/test/library-tests/dataflow/global/main.rs

@@ -320,7 +320,7 @@ async fn async_source() -> i64 {
 
 async fn test_async_await_async_part() {
     let a = async_source().await;
-    sink(a); // $ MISSING: hasValueFlow=1
+    sink(a); // $ hasTaintFlow=1 MISSING: hasValueFlow=1
 
     let b = async {
         let c = source(2);

rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected

@@ -51,7 +51,9 @@ edges
 | test.rs:48:22:48:30 | query_map | test.rs:50:14:50:24 | ...: i64 | provenance | Src:MaD:3  |
 | test.rs:50:14:50:24 | ...: i64 | test.rs:51:22:51:27 | values | provenance |  |
 | test.rs:55:22:55:30 | query_map | test.rs:57:14:57:39 | ...: ... | provenance | Src:MaD:3  |
+| test.rs:57:14:57:39 | ...: ... | test.rs:58:22:58:29 | values.0 | provenance |  |
 | test.rs:57:14:57:39 | ...: ... | test.rs:59:22:59:29 | values.1 | provenance |  |
+| test.rs:57:14:57:39 | ...: ... | test.rs:60:22:60:29 | values.2 | provenance |  |
 | test.rs:64:13:64:17 | total | test.rs:68:14:68:18 | total | provenance |  |
 | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | test.rs:64:21:67:11 | TryExpr | provenance |  |
 | test.rs:64:21:67:11 | TryExpr | test.rs:64:13:64:17 | total | provenance |  |
@@ -64,8 +66,12 @@ edges
 | test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:12 |
 | test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:15 |
 | test.rs:70:22:70:31 | query_fold | test.rs:70:83:70:105 | ...: ... | provenance | Src:MaD:2  |
+| test.rs:70:83:70:105 | ...: ... | test.rs:71:17:71:18 | id | provenance |  |
 | test.rs:70:83:70:105 | ...: ... | test.rs:72:17:72:20 | name | provenance |  |
+| test.rs:70:83:70:105 | ...: ... | test.rs:73:17:73:19 | age | provenance |  |
+| test.rs:71:17:71:18 | id | test.rs:74:18:74:19 | id | provenance |  |
 | test.rs:72:17:72:20 | name | test.rs:75:18:75:21 | name | provenance |  |
+| test.rs:73:17:73:19 | age | test.rs:76:18:76:20 | age | provenance |  |
 | test.rs:105:13:105:14 | v1 | test.rs:106:14:106:15 | v1 | provenance |  |
 | test.rs:105:24:105:33 | row.get(...) [Some] | test.rs:105:24:105:42 | ... .unwrap() | provenance | MaD:16 |
 | test.rs:105:24:105:42 | ... .unwrap() | test.rs:105:13:105:14 | v1 | provenance |  |
@@ -87,7 +93,9 @@ edges
 | test.rs:135:22:135:30 | query_map | test.rs:137:14:137:24 | ...: i64 | provenance | Src:MaD:5  |
 | test.rs:137:14:137:24 | ...: i64 | test.rs:138:22:138:27 | values | provenance |  |
 | test.rs:142:22:142:30 | query_map | test.rs:144:14:144:39 | ...: ... | provenance | Src:MaD:5  |
+| test.rs:144:14:144:39 | ...: ... | test.rs:145:22:145:29 | values.0 | provenance |  |
 | test.rs:144:14:144:39 | ...: ... | test.rs:146:22:146:29 | values.1 | provenance |  |
+| test.rs:144:14:144:39 | ...: ... | test.rs:147:22:147:29 | values.2 | provenance |  |
 | test.rs:151:13:151:17 | total | test.rs:155:14:155:18 | total | provenance |  |
 | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | test.rs:151:21:154:16 | await ... [Ok] | provenance |  |
 | test.rs:151:21:154:16 | await ... [Ok] | test.rs:151:21:154:17 | TryExpr | provenance |  |
@@ -101,8 +109,12 @@ edges
 | test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:12 |
 | test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:15 |
 | test.rs:157:22:157:31 | query_fold | test.rs:157:83:157:105 | ...: ... | provenance | Src:MaD:4  |
+| test.rs:157:83:157:105 | ...: ... | test.rs:158:17:158:18 | id | provenance |  |
 | test.rs:157:83:157:105 | ...: ... | test.rs:159:17:159:20 | name | provenance |  |
+| test.rs:157:83:157:105 | ...: ... | test.rs:160:17:160:19 | age | provenance |  |
+| test.rs:158:17:158:18 | id | test.rs:161:18:161:19 | id | provenance |  |
 | test.rs:159:17:159:20 | name | test.rs:162:18:162:21 | name | provenance |  |
+| test.rs:160:17:160:19 | age | test.rs:163:18:163:20 | age | provenance |  |
 nodes
 | test.rs:18:13:18:14 | v1 | semmle.label | v1 |
 | test.rs:18:24:18:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
@@ -147,7 +159,9 @@ nodes
 | test.rs:51:22:51:27 | values | semmle.label | values |
 | test.rs:55:22:55:30 | query_map | semmle.label | query_map |
 | test.rs:57:14:57:39 | ...: ... | semmle.label | ...: ... |
+| test.rs:58:22:58:29 | values.0 | semmle.label | values.0 |
 | test.rs:59:22:59:29 | values.1 | semmle.label | values.1 |
+| test.rs:60:22:60:29 | values.2 | semmle.label | values.2 |
 | test.rs:64:13:64:17 | total | semmle.label | total |
 | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | semmle.label | conn.query_fold(...) [Ok] |
 | test.rs:64:21:67:11 | TryExpr | semmle.label | TryExpr |
@@ -160,8 +174,12 @@ nodes
 | test.rs:68:14:68:18 | total | semmle.label | total |
 | test.rs:70:22:70:31 | query_fold | semmle.label | query_fold |
 | test.rs:70:83:70:105 | ...: ... | semmle.label | ...: ... |
+| test.rs:71:17:71:18 | id | semmle.label | id |
 | test.rs:72:17:72:20 | name | semmle.label | name |
+| test.rs:73:17:73:19 | age | semmle.label | age |
+| test.rs:74:18:74:19 | id | semmle.label | id |
 | test.rs:75:18:75:21 | name | semmle.label | name |
+| test.rs:76:18:76:20 | age | semmle.label | age |
 | test.rs:105:13:105:14 | v1 | semmle.label | v1 |
 | test.rs:105:24:105:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
 | test.rs:105:24:105:42 | ... .unwrap() | semmle.label | ... .unwrap() |
@@ -189,7 +207,9 @@ nodes
 | test.rs:138:22:138:27 | values | semmle.label | values |
 | test.rs:142:22:142:30 | query_map | semmle.label | query_map |
 | test.rs:144:14:144:39 | ...: ... | semmle.label | ...: ... |
+| test.rs:145:22:145:29 | values.0 | semmle.label | values.0 |
 | test.rs:146:22:146:29 | values.1 | semmle.label | values.1 |
+| test.rs:147:22:147:29 | values.2 | semmle.label | values.2 |
 | test.rs:151:13:151:17 | total | semmle.label | total |
 | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | semmle.label | conn.query_fold(...) [future, Ok] |
 | test.rs:151:21:154:16 | await ... [Ok] | semmle.label | await ... [Ok] |
@@ -203,8 +223,12 @@ nodes
 | test.rs:155:14:155:18 | total | semmle.label | total |
 | test.rs:157:22:157:31 | query_fold | semmle.label | query_fold |
 | test.rs:157:83:157:105 | ...: ... | semmle.label | ...: ... |
+| test.rs:158:17:158:18 | id | semmle.label | id |
 | test.rs:159:17:159:20 | name | semmle.label | name |
+| test.rs:160:17:160:19 | age | semmle.label | age |
+| test.rs:161:18:161:19 | id | semmle.label | id |
 | test.rs:162:18:162:21 | name | semmle.label | name |
+| test.rs:163:18:163:20 | age | semmle.label | age |
 subpaths
 testFailures
 #select
@@ -216,16 +240,24 @@ testFailures
 | test.rs:41:14:41:70 | ... .unwrap() | test.rs:41:42:41:44 | get | test.rs:41:14:41:70 | ... .unwrap() | $@ | test.rs:41:42:41:44 | get | get |
 | test.rs:44:22:44:22 | v | test.rs:40:27:40:35 | exec_iter | test.rs:44:22:44:22 | v | $@ | test.rs:40:27:40:35 | exec_iter | exec_iter |
 | test.rs:51:22:51:27 | values | test.rs:48:22:48:30 | query_map | test.rs:51:22:51:27 | values | $@ | test.rs:48:22:48:30 | query_map | query_map |
+| test.rs:58:22:58:29 | values.0 | test.rs:55:22:55:30 | query_map | test.rs:58:22:58:29 | values.0 | $@ | test.rs:55:22:55:30 | query_map | query_map |
 | test.rs:59:22:59:29 | values.1 | test.rs:55:22:55:30 | query_map | test.rs:59:22:59:29 | values.1 | $@ | test.rs:55:22:55:30 | query_map | query_map |
+| test.rs:60:22:60:29 | values.2 | test.rs:55:22:55:30 | query_map | test.rs:60:22:60:29 | values.2 | $@ | test.rs:55:22:55:30 | query_map | query_map |
 | test.rs:65:18:65:20 | row | test.rs:64:26:64:35 | query_fold | test.rs:65:18:65:20 | row | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
 | test.rs:68:14:68:18 | total | test.rs:64:26:64:35 | query_fold | test.rs:68:14:68:18 | total | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
+| test.rs:74:18:74:19 | id | test.rs:70:22:70:31 | query_fold | test.rs:74:18:74:19 | id | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
 | test.rs:75:18:75:21 | name | test.rs:70:22:70:31 | query_fold | test.rs:75:18:75:21 | name | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
+| test.rs:76:18:76:20 | age | test.rs:70:22:70:31 | query_fold | test.rs:76:18:76:20 | age | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
 | test.rs:106:14:106:15 | v1 | test.rs:105:28:105:30 | get | test.rs:106:14:106:15 | v1 | $@ | test.rs:105:28:105:30 | get | get |
 | test.rs:109:14:109:15 | v2 | test.rs:108:28:108:34 | get_opt | test.rs:109:14:109:15 | v2 | $@ | test.rs:108:28:108:34 | get_opt | get_opt |
 | test.rs:112:14:112:15 | v3 | test.rs:111:28:111:31 | take | test.rs:112:14:112:15 | v3 | $@ | test.rs:111:28:111:31 | take | take |
 | test.rs:115:14:115:15 | v4 | test.rs:114:28:114:35 | take_opt | test.rs:115:14:115:15 | v4 | $@ | test.rs:114:28:114:35 | take_opt | take_opt |
 | test.rs:138:22:138:27 | values | test.rs:135:22:135:30 | query_map | test.rs:138:22:138:27 | values | $@ | test.rs:135:22:135:30 | query_map | query_map |
+| test.rs:145:22:145:29 | values.0 | test.rs:142:22:142:30 | query_map | test.rs:145:22:145:29 | values.0 | $@ | test.rs:142:22:142:30 | query_map | query_map |
 | test.rs:146:22:146:29 | values.1 | test.rs:142:22:142:30 | query_map | test.rs:146:22:146:29 | values.1 | $@ | test.rs:142:22:142:30 | query_map | query_map |
+| test.rs:147:22:147:29 | values.2 | test.rs:142:22:142:30 | query_map | test.rs:147:22:147:29 | values.2 | $@ | test.rs:142:22:142:30 | query_map | query_map |
 | test.rs:152:18:152:20 | row | test.rs:151:26:151:35 | query_fold | test.rs:152:18:152:20 | row | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
 | test.rs:155:14:155:18 | total | test.rs:151:26:151:35 | query_fold | test.rs:155:14:155:18 | total | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
+| test.rs:161:18:161:19 | id | test.rs:157:22:157:31 | query_fold | test.rs:161:18:161:19 | id | $@ | test.rs:157:22:157:31 | query_fold | query_fold |
 | test.rs:162:18:162:21 | name | test.rs:157:22:157:31 | query_fold | test.rs:162:18:162:21 | name | $@ | test.rs:157:22:157:31 | query_fold | query_fold |
+| test.rs:163:18:163:20 | age | test.rs:157:22:157:31 | query_fold | test.rs:163:18:163:20 | age | $@ | test.rs:157:22:157:31 | query_fold | query_fold |

rust/ql/test/library-tests/dataflow/sources/database/test.rs

@@ -55,9 +55,9 @@ mod test_mysql {
         let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
             "SELECT id, name, age FROM person",
             |values: (i64, String, i32)| -> () {
-                sink(values.0); // $ MISSING: hasTaintFlow
+                sink(values.0); // $ hasTaintFlow
                 sink(values.1); // $ hasTaintFlow
-                sink(values.2); // $ MISSING: hasTaintFlow
+                sink(values.2); // $ hasTaintFlow
             }
         )?;
 
@@ -71,9 +71,9 @@ mod test_mysql {
             let id: i64 = row.0;
             let name: String = row.1;
             let age: i32 = row.2;
-            sink(id); // $ MISSING: hasTaintFlow
+            sink(id); // $ hasTaintFlow
             sink(name); // $ hasTaintFlow
-            sink(age); // $ MISSING: hasTaintFlow
+            sink(age); // $ hasTaintFlow
             acc + 1
         })?;
 
@@ -142,9 +142,9 @@ mod test_mysql_async {
         let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
             "SELECT id, name, age FROM person",
             |values: (i64, String, i32)| -> () {
-                sink(values.0); // $ MISSING: hasTaintFlow
+                sink(values.0); // $ hasTaintFlow
                 sink(values.1); // $ hasTaintFlow
-                sink(values.2); // $ MISSING: hasTaintFlow
+                sink(values.2); // $ hasTaintFlow
             }
         ).await?;
 
@@ -158,9 +158,9 @@ mod test_mysql_async {
             let id: i64 = row.0;
             let name: String = row.1;
             let age: i32 = row.2;
-            sink(id); // $ MISSING: hasTaintFlow
+            sink(id); // $ hasTaintFlow
             sink(name); // $ hasTaintFlow
-            sink(age); // $ MISSING: hasTaintFlow
+            sink(age); // $ hasTaintFlow
             acc + 1
         }).await?;