Merge pull request #20997 from paldepind/rust/fix-expected

Rust: Accept changes to expected files

Author: hvitved

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

@@ -1,6 +1,7 @@
 models
 | 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
-| 2 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
+| 2 | Summary: <_ as core::ops::arith::Mul>::mul; Argument[self]; ReturnValue; taint |
+| 3 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
 edges
 | main.rs:12:28:14:1 | { ... } | main.rs:17:13:17:23 | get_data(...) | provenance |  |
 | main.rs:13:5:13:13 | source(...) | main.rs:12:28:14:1 | { ... } | provenance |  |
@@ -192,10 +193,11 @@ edges
 | 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 |  |
 | main.rs:334:13:334:55 | ...::block_on(...) | main.rs:334:9:334:9 | a | provenance |  |
-| main.rs:334:41:334:54 | async_source(...) | main.rs:334:13:334:55 | ...::block_on(...) | provenance | MaD:2 |
+| main.rs:334:41:334:54 | async_source(...) | main.rs:334:13:334:55 | ...::block_on(...) | provenance | MaD:3 |
 | main.rs:346:44:348:9 | { ... } | main.rs:383:18:383:38 | t.get_double_number() | provenance |  |
 | main.rs:346:44:348:9 | { ... } | main.rs:387:18:387:50 | ...::get_double_number(...) | provenance |  |
-| main.rs:347:13:347:29 | self.get_number() | main.rs:346:44:348:9 | { ... } | provenance |  |
+| main.rs:347:13:347:29 | self.get_number() | main.rs:347:13:347:33 | ... * ... | provenance | MaD:2 |
+| main.rs:347:13:347:33 | ... * ... | main.rs:346:44:348:9 | { ... } | provenance |  |
 | main.rs:350:33:352:9 | { ... } | main.rs:391:18:391:37 | ...::get_default(...) | provenance |  |
 | main.rs:351:13:351:21 | source(...) | main.rs:350:33:352:9 | { ... } | provenance |  |
 | main.rs:358:37:360:9 | { ... } | main.rs:347:13:347:29 | self.get_number() | provenance |  |
@@ -426,6 +428,7 @@ nodes
 | main.rs:335:10:335:10 | a | semmle.label | a |
 | main.rs:346:44:348:9 | { ... } | semmle.label | { ... } |
 | main.rs:347:13:347:29 | self.get_number() | semmle.label | self.get_number() |
+| main.rs:347:13:347:33 | ... * ... | semmle.label | ... * ... |
 | main.rs:350:33:352:9 | { ... } | semmle.label | { ... } |
 | main.rs:351:13:351:21 | source(...) | semmle.label | source(...) |
 | main.rs:358:37:360:9 | { ... } | semmle.label | { ... } |

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

@@ -108,6 +108,7 @@
 | main.rs:337:33:337:61 | test_async_await_async_part(...) | main.rs:321:1:331:1 | fn test_async_await_async_part |
 | main.rs:347:13:347:29 | self.get_number() | main.rs:358:9:360:9 | fn get_number |
 | main.rs:347:13:347:29 | self.get_number() | main.rs:366:9:368:9 | fn get_number |
+| main.rs:347:13:347:33 | ... * ... | {EXTERNAL LOCATION} | fn mul |
 | main.rs:351:13:351:21 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:359:13:359:21 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:371:13:371:22 | source(...) | main.rs:1:1:3:1 | fn source |

rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected

@@ -193,10 +193,6 @@ edges
 | lifetime.rs:798:9:798:12 | &val | lifetime.rs:798:2:798:12 | return ... | provenance |  |
 | lifetime.rs:802:6:802:8 | ptr | lifetime.rs:808:23:808:25 | ptr | provenance |  |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | lifetime.rs:802:6:802:8 | ptr | provenance |  |
-| lifetime.rs:841:13:841:27 | ...: ... | lifetime.rs:843:12:843:14 | ptr | provenance |  |
-| lifetime.rs:851:6:851:8 | ptr | lifetime.rs:853:20:853:22 | ptr | provenance |  |
-| lifetime.rs:851:12:851:23 | &local_value | lifetime.rs:851:6:851:8 | ptr | provenance |  |
-| lifetime.rs:853:20:853:22 | ptr | lifetime.rs:841:13:841:27 | ...: ... | provenance |  |
 | main.rs:18:9:18:10 | p1 [&ref] | main.rs:21:19:21:20 | p1 | provenance |  |
 | main.rs:18:9:18:10 | p1 [&ref] | main.rs:29:19:29:20 | p1 | provenance |  |
 | main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | main.rs:18:9:18:10 | p1 [&ref] | provenance |  |
@@ -412,11 +408,6 @@ nodes
 | lifetime.rs:802:6:802:8 | ptr | semmle.label | ptr |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | semmle.label | get_pointer(...) |
 | lifetime.rs:808:23:808:25 | ptr | semmle.label | ptr |
-| lifetime.rs:841:13:841:27 | ...: ... | semmle.label | ...: ... |
-| lifetime.rs:843:12:843:14 | ptr | semmle.label | ptr |
-| lifetime.rs:851:6:851:8 | ptr | semmle.label | ptr |
-| lifetime.rs:851:12:851:23 | &local_value | semmle.label | &local_value |
-| lifetime.rs:853:20:853:22 | ptr | semmle.label | ptr |
 | main.rs:18:9:18:10 | p1 [&ref] | semmle.label | p1 [&ref] |
 | main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | semmle.label | ...::as_ptr(...) [&ref] |
 | main.rs:18:26:18:28 | &b1 | semmle.label | &b1 |