Rust: Repair after merge.

Author: geoffw0

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

@@ -1,3 +0,0 @@
-multipleCallTargets
-| test.rs:266:22:266:43 | file.read(...) |
-| test.rs:275:22:275:41 | f1.read(...) |

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

@@ -242,15 +242,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); // $ MISSING: 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); // $ MISSING: hasTaintFlow="file.txt"
     }
 
     Ok(())

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

@@ -1,17 +1,10 @@
 multipleCallTargets
 | test.rs:59:62:59:77 | ...::from(...) |
 | test.rs:66:58:66:73 | ...::from(...) |
-| test.rs:399:31:399:88 | ...::read(...) |
-| test.rs:403:31:403:55 | reader.read(...) |
-| test.rs:437:26:437:43 | reader2.fill_buf() |
-| test.rs:457:31:457:89 | ...::read(...) |
-| test.rs:461:31:461:56 | reader2.read(...) |
-| test.rs:479:26:479:43 | reader2.fill_buf() |
-| test.rs:486:31:486:66 | reader2.read_until(...) |
-| test.rs:493:31:493:58 | reader2.read_line(...) |
-| test.rs:500:31:500:62 | reader2.read_to_end(...) |
-| test.rs:506:36:506:50 | reader2.lines() |
-| test.rs:507:18:507:36 | lines_stream.next() |
-| test.rs:508:36:508:54 | lines_stream.next() |
+| test.rs:389:30:389:67 | pinned.poll_read(...) |
+| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) |
+| test.rs:423:27:423:71 | ... .poll_fill_buf(...) |
+| test.rs:447:30:447:67 | pinned.poll_read(...) |
+| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) |
 | test.rs:519:50:519:66 | ...::from(...) |
 | test.rs:519:50:519:66 | ...::from(...) |