Rust: Update expected output

Author: hvitved

rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected

@@ -5,4 +5,3 @@ multipleCallTargets
 | proc_macro.rs:41:5:41:10 | ...::new(...) |
 | proc_macro.rs:41:5:41:10 | ...::new(...) |
 | proc_macro.rs:41:5:41:10 | ...::new(...) |
-| proc_macro.rs:44:27:44:30 | ...::to_tokens(...) |

rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/TypeInferenceConsistency.expected

@@ -59,8 +59,6 @@
 | main.rs:212:13:212:34 | ...::new(...) | main.rs:205:5:208:5 | fn new |
 | main.rs:212:24:212:33 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:214:5:214:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:228:10:228:14 | * ... | main.rs:235:5:237:5 | fn deref |
-| main.rs:236:11:236:15 | * ... | main.rs:235:5:237:5 | fn deref |
 | main.rs:242:28:242:36 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:244:13:244:17 | ... + ... | main.rs:220:5:223:5 | fn add |
 | main.rs:245:5:245:17 | sink(...) | main.rs:5:1:7:1 | fn sink |

rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected

@@ -1005,33 +1005,35 @@ readStep
 | main.rs:458:5:458:11 | mut_arr | file://:0:0:0:0 | element | main.rs:458:5:458:14 | mut_arr[1] |
 | main.rs:459:13:459:19 | mut_arr | file://:0:0:0:0 | element | main.rs:459:13:459:22 | mut_arr[1] |
 | main.rs:461:10:461:16 | mut_arr | file://:0:0:0:0 | element | main.rs:461:10:461:19 | mut_arr[0] |
-| main.rs:467:24:467:33 | [post] receiver for source(...) | file://:0:0:0:0 | &ref | main.rs:467:24:467:33 | [post] source(...) |
 | main.rs:468:9:468:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:468:10:468:13 | cond |
 | main.rs:468:9:468:20 | TuplePat | file://:0:0:0:0 | tuple.1 | main.rs:468:16:468:19 | name |
 | main.rs:468:25:468:29 | names | file://:0:0:0:0 | element | main.rs:468:9:468:20 | TuplePat |
 | main.rs:470:41:470:67 | [post] \|...\| ... | main.rs:467:9:467:20 | captured default_name | main.rs:470:41:470:67 | [post] default_name |
-| main.rs:470:44:470:55 | [post] receiver for default_name | file://:0:0:0:0 | &ref | main.rs:470:44:470:55 | [post] default_name |
 | main.rs:470:44:470:55 | this | main.rs:467:9:467:20 | captured default_name | main.rs:470:44:470:55 | default_name |
 | main.rs:471:18:471:18 | [post] receiver for n | file://:0:0:0:0 | &ref | main.rs:471:18:471:18 | [post] n |
-| main.rs:494:13:494:13 | [post] receiver for a | file://:0:0:0:0 | &ref | main.rs:494:13:494:13 | [post] a |
-| main.rs:495:13:495:13 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:495:13:495:13 | [post] b |
-| main.rs:496:18:496:18 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:496:18:496:18 | [post] b |
 | main.rs:507:10:507:11 | vs | file://:0:0:0:0 | element | main.rs:507:10:507:14 | vs[0] |
 | main.rs:508:11:508:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:10:508:35 | * ... |
+| main.rs:508:11:508:35 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:11:508:35 | [post] ... .unwrap() |
 | main.rs:509:11:509:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:509:10:509:35 | * ... |
+| main.rs:509:11:509:35 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:509:11:509:35 | [post] ... .unwrap() |
 | main.rs:511:14:511:15 | vs | file://:0:0:0:0 | element | main.rs:511:9:511:9 | v |
 | main.rs:514:9:514:10 | &... | file://:0:0:0:0 | &ref | main.rs:514:10:514:10 | v |
 | main.rs:514:15:514:23 | vs.iter() | file://:0:0:0:0 | element | main.rs:514:9:514:10 | &... |
 | main.rs:519:9:519:10 | &... | file://:0:0:0:0 | &ref | main.rs:519:10:519:10 | v |
 | main.rs:519:15:519:17 | vs2 | file://:0:0:0:0 | element | main.rs:519:9:519:10 | &... |
+| main.rs:523:29:523:29 | [post] receiver for x | file://:0:0:0:0 | &ref | main.rs:523:29:523:29 | [post] x |
 | main.rs:523:29:523:29 | x | file://:0:0:0:0 | &ref | main.rs:523:28:523:29 | * ... |
+| main.rs:524:34:524:34 | [post] receiver for x | file://:0:0:0:0 | &ref | main.rs:524:34:524:34 | [post] x |
 | main.rs:524:34:524:34 | x | file://:0:0:0:0 | &ref | main.rs:524:33:524:34 | * ... |
 | main.rs:526:14:526:27 | vs.into_iter() | file://:0:0:0:0 | element | main.rs:526:9:526:9 | v |
 | main.rs:532:10:532:15 | vs_mut | file://:0:0:0:0 | element | main.rs:532:10:532:18 | vs_mut[0] |
 | main.rs:533:11:533:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:533:10:533:39 | * ... |
+| main.rs:533:11:533:39 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:533:11:533:39 | [post] ... .unwrap() |
 | main.rs:534:11:534:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:534:10:534:39 | * ... |
+| main.rs:534:11:534:39 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:534:11:534:39 | [post] ... .unwrap() |
 | main.rs:536:9:536:14 | &mut ... | file://:0:0:0:0 | &ref | main.rs:536:14:536:14 | v |
 | main.rs:536:19:536:35 | vs_mut.iter_mut() | file://:0:0:0:0 | element | main.rs:536:9:536:14 | &mut ... |
+| main.rs:550:11:550:15 | [post] receiver for c_ref | file://:0:0:0:0 | &ref | main.rs:550:11:550:15 | [post] c_ref |
 | main.rs:550:11:550:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:550:10:550:15 | * ... |
 storeStep
 | main.rs:104:11:104:11 | i | file://:0:0:0:0 | &ref | main.rs:104:11:104:11 | receiver for i |
@@ -1113,21 +1115,23 @@ storeStep
 | main.rs:455:27:455:27 | 2 | file://:0:0:0:0 | element | main.rs:455:23:455:31 | [...] |
 | main.rs:455:30:455:30 | 3 | file://:0:0:0:0 | element | main.rs:455:23:455:31 | [...] |
 | main.rs:458:18:458:27 | source(...) | file://:0:0:0:0 | element | main.rs:458:5:458:11 | [post] mut_arr |
-| main.rs:467:24:467:33 | source(...) | file://:0:0:0:0 | &ref | main.rs:467:24:467:33 | receiver for source(...) |
 | main.rs:470:41:470:67 | default_name | main.rs:467:9:467:20 | captured default_name | main.rs:470:41:470:67 | \|...\| ... |
-| main.rs:470:44:470:55 | default_name | file://:0:0:0:0 | &ref | main.rs:470:44:470:55 | receiver for default_name |
 | main.rs:471:18:471:18 | n | file://:0:0:0:0 | &ref | main.rs:471:18:471:18 | receiver for n |
-| main.rs:494:13:494:13 | a | file://:0:0:0:0 | &ref | main.rs:494:13:494:13 | receiver for a |
-| main.rs:495:13:495:13 | b | file://:0:0:0:0 | &ref | main.rs:495:13:495:13 | receiver for b |
-| main.rs:496:18:496:18 | b | file://:0:0:0:0 | &ref | main.rs:496:18:496:18 | receiver for b |
 | main.rs:505:15:505:24 | source(...) | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
 | main.rs:505:27:505:27 | 2 | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
 | main.rs:505:30:505:30 | 3 | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
 | main.rs:505:33:505:33 | 4 | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
+| main.rs:508:11:508:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:11:508:35 | receiver for ... .unwrap() |
+| main.rs:509:11:509:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:509:11:509:35 | receiver for ... .unwrap() |
+| main.rs:523:29:523:29 | x | file://:0:0:0:0 | &ref | main.rs:523:29:523:29 | receiver for x |
+| main.rs:524:34:524:34 | x | file://:0:0:0:0 | &ref | main.rs:524:34:524:34 | receiver for x |
 | main.rs:530:23:530:32 | source(...) | file://:0:0:0:0 | element | main.rs:530:22:530:42 | [...] |
 | main.rs:530:35:530:35 | 2 | file://:0:0:0:0 | element | main.rs:530:22:530:42 | [...] |
 | main.rs:530:38:530:38 | 3 | file://:0:0:0:0 | element | main.rs:530:22:530:42 | [...] |
 | main.rs:530:41:530:41 | 4 | file://:0:0:0:0 | element | main.rs:530:22:530:42 | [...] |
+| main.rs:533:11:533:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:533:11:533:39 | receiver for ... .unwrap() |
+| main.rs:534:11:534:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:534:11:534:39 | receiver for ... .unwrap() |
 | main.rs:545:18:545:18 | c | file://:0:0:0:0 | &ref | main.rs:545:17:545:18 | &c |
 | main.rs:548:15:548:15 | b | file://:0:0:0:0 | &ref | main.rs:548:14:548:15 | &b |
+| main.rs:550:11:550:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:550:11:550:15 | receiver for c_ref |
 | main.rs:571:27:571:27 | 0 | {EXTERNAL LOCATION} | Some | main.rs:571:22:571:28 | Some(...) |

rust/ql/test/library-tests/dataflow/global/viableCallable.expected

@@ -1,2 +1,4 @@
 multipleCallTargets
+| main.rs:322:14:322:33 | ... .cmp(...) |
+| main.rs:334:9:334:28 | ... .cmp(...) |
 | main.rs:362:14:362:30 | ... .lt(...) |

rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected

@@ -11,6 +11,8 @@ multipleCallTargets
 | test.rs:179:30:179:68 | ...::_print(...) |
 | test.rs:188:26:188:105 | ...::_print(...) |
 | test.rs:229:22:229:72 | ... .read_to_string(...) |
+| test.rs:639:26:639:43 | file1.chain(...) |
+| test.rs:647:26:647:40 | file1.take(...) |
 | test.rs:697:18:697:38 | ...::_print(...) |
 | test.rs:702:18:702:45 | ...::_print(...) |
 | test.rs:720:38:720:42 | ...::_print(...) |
@@ -29,6 +31,7 @@ multipleCallTargets
 | test.rs:825:30:825:43 | ...::_print(...) |
 | test.rs:840:14:840:43 | ...::_print(...) |
 | test.rs:854:14:854:34 | ...::_print(...) |
+| test.rs:865:23:865:80 | ...::try_from(...) |
 | test.rs:894:50:894:66 | ...::from(...) |
 | test.rs:894:50:894:66 | ...::from(...) |
 | test.rs:896:14:896:31 | ...::_print(...) |
@@ -73,23 +76,9 @@ multipleCallTargets
 | test.rs:977:14:977:29 | ...::_print(...) |
 | test.rs:979:27:979:36 | ...::_print(...) |
 | test.rs:980:28:980:41 | ...::_print(...) |
-| test_futures_io.rs:45:27:45:84 | ...::read(...) |
-| test_futures_io.rs:49:27:49:51 | reader.read(...) |
-| test_futures_io.rs:83:22:83:39 | reader2.fill_buf() |
-| test_futures_io.rs:103:27:103:85 | ...::read(...) |
-| test_futures_io.rs:107:27:107:52 | reader2.read(...) |
-| test_futures_io.rs:125:22:125:39 | reader2.fill_buf() |
-| test_futures_io.rs:132:27:132:62 | reader2.read_until(...) |
-| test_futures_io.rs:139:27:139:54 | reader2.read_line(...) |
-| test_futures_io.rs:146:27:146:58 | reader2.read_to_end(...) |
-| test_futures_io.rs:152:32:152:46 | reader2.lines() |
-| test_futures_io.rs:153:14:153:32 | lines_stream.next() |
-| test_futures_io.rs:154:32:154:50 | lines_stream.next() |
-| web_frameworks.rs:13:14:13:22 | a.as_str() |
-| web_frameworks.rs:13:14:13:23 | a.as_str() |
-| web_frameworks.rs:14:14:14:24 | a.as_bytes() |
-| web_frameworks.rs:14:14:14:25 | a.as_bytes() |
-| web_frameworks.rs:101:14:101:23 | a.as_str() |
-| web_frameworks.rs:102:14:102:25 | a.as_bytes() |
-| web_frameworks.rs:158:14:158:23 | a.as_str() |
-| web_frameworks.rs:159:14:159:25 | a.as_bytes() |
+| test_futures_io.rs:25:23:25:80 | ...::try_from(...) |
+| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) |
+| test_futures_io.rs:62:22:62:50 | pinned.poll_fill_buf(...) |
+| test_futures_io.rs:69:23:69:67 | ... .poll_fill_buf(...) |
+| test_futures_io.rs:93:26:93:63 | pinned.poll_read(...) |
+| test_futures_io.rs:116:22:116:50 | pinned.poll_fill_buf(...) |

rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

@@ -0,0 +1,38 @@
+| test.rs:312:24:312:40 | //... | Missing result: hasTaintFlow |
+| test.rs:319:24:319:40 | //... | Missing result: hasTaintFlow |
+| test.rs:326:24:326:40 | //... | Missing result: hasTaintFlow |
+| test.rs:333:24:333:40 | //... | Missing result: hasTaintFlow |
+| test.rs:342:19:342:35 | //... | Missing result: hasTaintFlow |
+| test.rs:343:19:343:35 | //... | Missing result: hasTaintFlow |
+| test.rs:344:19:344:35 | //... | Missing result: hasTaintFlow |
+| test.rs:345:19:345:35 | //... | Missing result: hasTaintFlow |
+| test.rs:352:24:352:40 | //... | Missing result: hasTaintFlow |
+| test.rs:360:22:360:38 | //... | Missing result: hasTaintFlow |
+| test.rs:373:24:373:40 | //... | Missing result: hasTaintFlow |
+| test.rs:380:24:380:40 | //... | Missing result: hasTaintFlow |
+| test.rs:381:26:381:42 | //... | Missing result: hasTaintFlow |
+| test.rs:386:60:386:76 | //... | Missing result: hasTaintFlow |
+| test.rs:388:26:388:42 | //... | Missing result: hasTaintFlow |
+| test.rs:395:50:395:66 | //... | Missing result: hasTaintFlow |
+| test.rs:397:25:397:41 | //... | Missing result: hasTaintFlow |
+| test.rs:586:24:586:51 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:592:24:592:51 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:598:24:598:51 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:604:24:604:51 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:612:19:612:46 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:613:19:613:46 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:614:19:614:46 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:615:19:615:46 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:621:24:621:51 | //... | Missing result: hasTaintFlow="file.txt" |
+| test.rs:630:24:630:49 | //... | Missing result: hasTaintFlow="f1.txt" |
+| test.rs:778:25:778:49 | //... | Missing result: hasTaintFlow=address |
+| test.rs:779:27:779:51 | //... | Missing result: hasTaintFlow=address |
+| test_futures_io.rs:46:40:46:60 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:51:40:51:60 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:84:23:84:43 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:104:40:104:60 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:108:40:108:60 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:126:23:126:43 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:133:22:133:42 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:140:22:140:42 | //... | Missing result: hasTaintFlow=url |
+| test_futures_io.rs:147:24:147:44 | //... | Missing result: hasTaintFlow=url |

rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected

@@ -638,15 +638,15 @@ async fn test_tokio_file() -> std::io::Result<()> {
         let file2 = tokio::fs::File::open("another_file.txt").await?; // $ Alert[rust/summary/taint-sources]
         let mut reader = file1.chain(file2);
         reader.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" hasTaintFlow="another_file.txt" -- we cannot resolve the `chain` and `read_to_string` calls above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
+        sink(&buffer); // $ hasTaintFlow="file.txt" hasTaintFlow="another_file.txt"
     }
 
     {
         let mut buffer = String::new();
         let file1 = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
         let mut reader = file1.take(100);
         reader.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `take` and `read_to_string` calls above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
+        sink(&buffer); // $ hasTaintFlow="file.txt"
     }
 
     Ok(())