Rust: accept test changes

2026-04-24 16:25:15 +02:00 · 2024-12-06 09:12:16 +01:00
parent d0804ac726
commit b59b90ba6d
13 changed files with 49 additions and 49 deletions
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -1,7 +1,7 @@
 canonicalPaths
 | anonymous.rs:1:1:1:26 | Use | None | None |
 | anonymous.rs:3:1:32:1 | fn canonicals | repo::test | crate::anonymous::canonicals |
-| anonymous.rs:4:5:4:23 | Struct | repo::test | {0}::OtherStruct |
+| anonymous.rs:4:5:4:23 | struct OtherStruct | repo::test | {0}::OtherStruct |
 | anonymous.rs:6:5:8:5 | trait OtherTrait | repo::test | {0}::OtherTrait |
 | anonymous.rs:7:9:7:20 | fn g | repo::test | {0}::OtherTrait::g |
 | anonymous.rs:10:5:12:5 | impl OtherTrait for OtherStruct { ... } | None | None |
@@ -11,13 +11,13 @@ canonicalPaths
 | anonymous.rs:18:5:20:5 | impl ...::Trait for OtherStruct { ... } | None | None |
 | anonymous.rs:19:9:19:22 | fn f | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
 | anonymous.rs:22:5:24:5 | fn nested | repo::test | {0}::nested |
-| anonymous.rs:23:9:23:27 | Struct | repo::test | {1}::OtherStruct |
+| anonymous.rs:23:9:23:27 | struct OtherStruct | repo::test | {1}::OtherStruct |
 | anonymous.rs:26:5:31:5 | fn usage | repo::test | {0}::usage |
 | anonymous.rs:34:1:36:1 | fn other | repo::test | crate::anonymous::other |
-| anonymous.rs:35:5:35:23 | Struct | repo::test | {36}::OtherStruct |
+| anonymous.rs:35:5:35:23 | struct OtherStruct | repo::test | {36}::OtherStruct |
 | lib.rs:1:1:1:14 | mod anonymous | repo::test | crate::anonymous |
 | lib.rs:2:1:2:12 | mod regular | repo::test | crate::regular |
-| regular.rs:1:1:2:18 | Struct | repo::test | crate::regular::Struct |
+| regular.rs:1:1:2:18 | struct Struct | repo::test | crate::regular::Struct |
 | regular.rs:4:1:6:1 | trait Trait | repo::test | crate::regular::Trait |
 | regular.rs:5:5:5:16 | fn f | repo::test | crate::regular::Trait::f |
 | regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | None |
@@ -38,17 +38,17 @@ canonicalPaths
 resolvedPaths
 | anonymous.rs:27:17:27:30 | OtherStruct {...} | repo::test | {0}::OtherStruct |
 | anonymous.rs:28:9:28:9 | s | None | None |
-| anonymous.rs:28:9:28:13 | ... .f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
+| anonymous.rs:28:9:28:13 | s.f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
 | anonymous.rs:29:9:29:9 | s | None | None |
-| anonymous.rs:29:9:29:13 | ... .g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
+| anonymous.rs:29:9:29:13 | s.g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
 | anonymous.rs:30:9:30:14 | nested | repo::test | {0}::nested |
 | regular.rs:27:13:27:21 | Struct {...} | repo::test | crate::regular::Struct |
 | regular.rs:28:5:28:5 | s | None | None |
-| regular.rs:28:5:28:9 | ... .f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
+| regular.rs:28:5:28:9 | s.f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
 | regular.rs:29:5:29:5 | s | None | None |
-| regular.rs:29:5:29:9 | ... .g(...) | repo::test | <crate::regular::Struct>::g |
+| regular.rs:29:5:29:9 | s.g(...) | repo::test | <crate::regular::Struct>::g |
 | regular.rs:30:5:30:5 | s | None | None |
-| regular.rs:30:5:30:9 | ... .h(...) | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
+| regular.rs:30:5:30:9 | s.h(...) | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
 | regular.rs:31:5:31:8 | free | repo::test | crate::regular::free |
 | regular.rs:41:9:41:26 | ...::None::<...> | lang:core | crate::option::Option::None |
 | regular.rs:42:9:42:20 | ...::Some | lang:core | crate::option::Option::Some |
--- a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
@@ -1,5 +1,4 @@
 noLocation
-| file://:0:0:0:0 | ... .parent(...) |
 | file://:0:0:0:0 | ... .unwrap(...) |
 | file://:0:0:0:0 | ...: ... |
 | file://:0:0:0:0 | ...::Path |
@@ -35,6 +34,7 @@ noLocation
 | file://:0:0:0:0 | path |
 | file://:0:0:0:0 | path |
 | file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path.parent(...) |
 | file://:0:0:0:0 | std |
 | file://:0:0:0:0 | std |
 | file://:0:0:0:0 | std |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
@@ -1 +1 @@
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -12,7 +12,7 @@
 | utf8_identifiers.rs:4:2:4:3 | ParamList |
 | utf8_identifiers.rs:4:5:4:6 | StmtList |
 | utf8_identifiers.rs:4:5:4:6 | { ... } |
-| utf8_identifiers.rs:6:1:8:1 | Struct |
+| utf8_identifiers.rs:6:1:8:1 | struct X |
 | utf8_identifiers.rs:6:8:6:8 | X |
 | utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
 | utf8_identifiers.rs:7:5:7:5 | \u03b4 |
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -19,10 +19,10 @@ edges
 | test.rs:11:23:11:34 | ...::new | test.rs:11:23:11:36 | ...::new(...) |  |
 | test.rs:11:23:11:36 | ...::new(...) | test.rs:11:13:11:19 | map |  |
 | test.rs:12:9:12:11 | map | test.rs:12:20:12:21 | 37 |  |
-| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | { ... } |  |
+| test.rs:12:9:12:27 | map.insert(...) | test.rs:10:22:13:5 | { ... } |  |
 | test.rs:12:9:12:28 | ExprStmt | test.rs:12:9:12:11 | map |  |
 | test.rs:12:20:12:21 | 37 | test.rs:12:24:12:26 | "a" |  |
-| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | ... .insert(...) |  |
+| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | map.insert(...) |  |
 | test.rs:18:5:24:5 | enter fn next | test.rs:18:13:18:13 | n |  |
 | test.rs:18:5:24:5 | exit fn next (normal) | test.rs:18:5:24:5 | exit fn next |  |
 | test.rs:18:13:18:13 | n | test.rs:18:13:18:18 | ...: i64 | match |
@@ -194,8 +194,8 @@ edges
 | test.rs:99:19:99:25 | Some(...) | test.rs:99:9:103:9 | while ... { ... } | no-match |
 | test.rs:99:19:99:25 | Some(...) | test.rs:99:24:99:24 | x | match |
 | test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
-| test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | ... .next(...) |  |
-| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | Some(...) |  |
+| test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | iter.next(...) |  |
+| test.rs:99:29:99:39 | iter.next(...) | test.rs:99:19:99:25 | Some(...) |  |
 | test.rs:99:41:103:9 | { ... } | test.rs:99:15:99:39 | let ... = ... |  |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:99:41:103:9 | { ... } |  |
 | test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 |  |
@@ -631,8 +631,8 @@ edges
 | test.rs:292:87:294:5 | { ... } | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) |  |
 | test.rs:293:9:293:10 | Ok | test.rs:293:12:293:12 | s |  |
 | test.rs:293:9:293:33 | Ok(...) | test.rs:292:87:294:5 | { ... } |  |
-| test.rs:293:12:293:12 | s | test.rs:293:12:293:27 | ... .parse(...) |  |
-| test.rs:293:12:293:27 | ... .parse(...) | test.rs:293:12:293:28 | TryExpr |  |
+| test.rs:293:12:293:12 | s | test.rs:293:12:293:27 | s.parse(...) |  |
+| test.rs:293:12:293:27 | s.parse(...) | test.rs:293:12:293:28 | TryExpr |  |
 | test.rs:293:12:293:28 | TryExpr | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) | return |
 | test.rs:293:12:293:28 | TryExpr | test.rs:293:32:293:32 | 4 | match |
 | test.rs:293:12:293:32 | ... + ... | test.rs:293:9:293:33 | Ok(...) |  |
--- a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
@@ -16,16 +16,16 @@ edges
 | main.rs:41:26:44:5 | { ... } | main.rs:41:13:44:6 | pass_through(...) | provenance |  |
 | main.rs:43:9:43:18 | source(...) | main.rs:41:26:44:5 | { ... } | provenance |  |
 | main.rs:56:23:56:28 | ...: i64 | main.rs:57:14:57:14 | n | provenance |  |
-| main.rs:59:31:65:5 | { ... } | main.rs:77:13:77:25 | ... .get_data(...) | provenance |  |
+| main.rs:59:31:65:5 | { ... } | main.rs:77:13:77:25 | mn.get_data(...) | provenance |  |
 | main.rs:63:13:63:21 | source(...) | main.rs:59:31:65:5 | { ... } | provenance |  |
 | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | provenance |  |
-| main.rs:77:13:77:25 | ... .get_data(...) | main.rs:78:10:78:10 | a | provenance |  |
+| main.rs:77:13:77:25 | mn.get_data(...) | main.rs:78:10:78:10 | a | provenance |  |
 | main.rs:83:13:83:21 | source(...) | main.rs:84:16:84:16 | a | provenance |  |
 | main.rs:84:16:84:16 | a | main.rs:56:23:56:28 | ...: i64 | provenance |  |
 | main.rs:89:13:89:21 | source(...) | main.rs:90:29:90:29 | a | provenance |  |
-| main.rs:90:13:90:30 | ... .data_through(...) | main.rs:91:10:91:10 | b | provenance |  |
+| main.rs:90:13:90:30 | mn.data_through(...) | main.rs:91:10:91:10 | b | provenance |  |
 | main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | provenance |  |
-| main.rs:90:29:90:29 | a | main.rs:90:13:90:30 | ... .data_through(...) | provenance |  |
+| main.rs:90:29:90:29 | a | main.rs:90:13:90:30 | mn.data_through(...) | provenance |  |
 nodes
 | main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
 | main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
@@ -51,18 +51,18 @@ nodes
 | main.rs:63:13:63:21 | source(...) | semmle.label | source(...) |
 | main.rs:66:28:66:33 | ...: i64 | semmle.label | ...: i64 |
 | main.rs:66:43:72:5 | { ... } | semmle.label | { ... } |
-| main.rs:77:13:77:25 | ... .get_data(...) | semmle.label | ... .get_data(...) |
+| main.rs:77:13:77:25 | mn.get_data(...) | semmle.label | mn.get_data(...) |
 | main.rs:78:10:78:10 | a | semmle.label | a |
 | main.rs:83:13:83:21 | source(...) | semmle.label | source(...) |
 | main.rs:84:16:84:16 | a | semmle.label | a |
 | main.rs:89:13:89:21 | source(...) | semmle.label | source(...) |
-| main.rs:90:13:90:30 | ... .data_through(...) | semmle.label | ... .data_through(...) |
+| main.rs:90:13:90:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
 | main.rs:90:29:90:29 | a | semmle.label | a |
 | main.rs:91:10:91:10 | b | semmle.label | b |
 subpaths
 | main.rs:36:26:36:26 | a | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:36:13:36:27 | pass_through(...) |
 | main.rs:41:26:44:5 | { ... } | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:41:13:44:6 | pass_through(...) |
-| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | main.rs:90:13:90:30 | ... .data_through(...) |
+| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | main.rs:90:13:90:30 | mn.data_through(...) |
 testFailures
 #select
 | main.rs:18:10:18:10 | a | main.rs:13:5:13:13 | source(...) | main.rs:18:10:18:10 | a | $@ | main.rs:13:5:13:13 | source(...) | source(...) |
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -12,12 +12,12 @@
 | main.rs:45:5:45:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:57:9:57:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:63:13:63:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:77:13:77:25 | ... .get_data(...) | main.rs:59:5:65:5 | fn get_data |
+| main.rs:77:13:77:25 | mn.get_data(...) | main.rs:59:5:65:5 | fn get_data |
 | main.rs:78:5:78:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:83:13:83:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:84:5:84:17 | ... .data_in(...) | main.rs:56:5:58:5 | fn data_in |
+| main.rs:84:5:84:17 | mn.data_in(...) | main.rs:56:5:58:5 | fn data_in |
 | main.rs:89:13:89:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:90:13:90:30 | ... .data_through(...) | main.rs:66:5:72:5 | fn data_through |
+| main.rs:90:13:90:30 | mn.data_through(...) | main.rs:66:5:72:5 | fn data_through |
 | main.rs:91:5:91:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:95:5:95:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
 | main.rs:96:5:96:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -35,7 +35,7 @@ edges
 | main.rs:214:14:214:14 | n | main.rs:214:25:214:25 | n | provenance |  |
 | main.rs:224:14:224:29 | Some(...) [Some] | main.rs:225:10:225:11 | s1 [Some] | provenance |  |
 | main.rs:224:19:224:28 | source(...) | main.rs:224:14:224:29 | Some(...) [Some] | provenance |  |
-| main.rs:225:10:225:11 | s1 [Some] | main.rs:225:10:225:20 | ... .unwrap(...) | provenance |  |
+| main.rs:225:10:225:11 | s1 [Some] | main.rs:225:10:225:20 | s1.unwrap(...) | provenance |  |
 | main.rs:229:14:229:29 | Some(...) [Some] | main.rs:231:14:231:15 | s1 [Some] | provenance |  |
 | main.rs:229:19:229:28 | source(...) | main.rs:229:14:229:29 | Some(...) [Some] | provenance |  |
 | main.rs:231:14:231:15 | s1 [Some] | main.rs:231:14:231:16 | TryExpr | provenance |  |
@@ -158,7 +158,7 @@ nodes
 | main.rs:224:14:224:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:224:19:224:28 | source(...) | semmle.label | source(...) |
 | main.rs:225:10:225:11 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:225:10:225:20 | ... .unwrap(...) | semmle.label | ... .unwrap(...) |
+| main.rs:225:10:225:20 | s1.unwrap(...) | semmle.label | s1.unwrap(...) |
 | main.rs:229:14:229:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:229:19:229:28 | source(...) | semmle.label | source(...) |
 | main.rs:231:14:231:15 | s1 [Some] | semmle.label | s1 [Some] |
@@ -262,7 +262,7 @@ testFailures
 | main.rs:152:10:152:10 | a | main.rs:148:12:148:21 | source(...) | main.rs:152:10:152:10 | a | $@ | main.rs:148:12:148:21 | source(...) | source(...) |
 | main.rs:201:33:201:33 | n | main.rs:198:27:198:36 | source(...) | main.rs:201:33:201:33 | n | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
 | main.rs:214:25:214:25 | n | main.rs:211:19:211:28 | source(...) | main.rs:214:25:214:25 | n | $@ | main.rs:211:19:211:28 | source(...) | source(...) |
-| main.rs:225:10:225:20 | ... .unwrap(...) | main.rs:224:19:224:28 | source(...) | main.rs:225:10:225:20 | ... .unwrap(...) | $@ | main.rs:224:19:224:28 | source(...) | source(...) |
+| main.rs:225:10:225:20 | s1.unwrap(...) | main.rs:224:19:224:28 | source(...) | main.rs:225:10:225:20 | s1.unwrap(...) | $@ | main.rs:224:19:224:28 | source(...) | source(...) |
 | main.rs:232:10:232:11 | i1 | main.rs:229:19:229:28 | source(...) | main.rs:232:10:232:11 | i1 | $@ | main.rs:229:19:229:28 | source(...) | source(...) |
 | main.rs:243:10:243:11 | i1 | main.rs:238:35:238:44 | source(...) | main.rs:243:10:243:11 | i1 | $@ | main.rs:238:35:238:44 | source(...) | source(...) |
 | main.rs:259:35:259:35 | n | main.rs:256:29:256:38 | source(...) | main.rs:259:35:259:35 | n | $@ | main.rs:256:29:256:38 | source(...) | source(...) |
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -945,9 +945,9 @@ edges
 | variables.rs:428:24:430:5 | exit \|...\| ... (normal) | variables.rs:428:24:430:5 | exit \|...\| ... |  |
 | variables.rs:428:27:430:5 | { ... } | variables.rs:428:24:430:5 | exit \|...\| ... (normal) |  |
 | variables.rs:429:9:429:9 | z | variables.rs:429:22:429:22 | 1 |  |
-| variables.rs:429:9:429:23 | ... .add_assign(...) | variables.rs:428:27:430:5 | { ... } |  |
+| variables.rs:429:9:429:23 | z.add_assign(...) | variables.rs:428:27:430:5 | { ... } |  |
 | variables.rs:429:9:429:24 | ExprStmt | variables.rs:429:9:429:9 | z |  |
-| variables.rs:429:22:429:22 | 1 | variables.rs:429:9:429:23 | ... .add_assign(...) |  |
+| variables.rs:429:22:429:22 | 1 | variables.rs:429:9:429:23 | z.add_assign(...) |  |
 | variables.rs:431:5:431:12 | closure3 | variables.rs:431:5:431:14 | closure3(...) |  |
 | variables.rs:431:5:431:14 | closure3(...) | variables.rs:432:5:432:17 | ExprStmt |  |
 | variables.rs:431:5:431:15 | ExprStmt | variables.rs:431:5:431:12 | closure3 |  |
@@ -1094,8 +1094,8 @@ edges
 | variables.rs:493:5:493:13 | print_i64 | variables.rs:493:15:493:15 | a |  |
 | variables.rs:493:5:493:25 | print_i64(...) | variables.rs:494:5:494:14 | ExprStmt |  |
 | variables.rs:493:5:493:26 | ExprStmt | variables.rs:493:5:493:13 | print_i64 |  |
-| variables.rs:493:15:493:15 | a | variables.rs:493:15:493:24 | ... .my_get(...) |  |
-| variables.rs:493:15:493:24 | ... .my_get(...) | variables.rs:493:5:493:25 | print_i64(...) |  |
+| variables.rs:493:15:493:15 | a | variables.rs:493:15:493:24 | a.my_get(...) |  |
+| variables.rs:493:15:493:24 | a.my_get(...) | variables.rs:493:5:493:25 | print_i64(...) |  |
 | variables.rs:494:5:494:5 | a | variables.rs:494:5:494:9 | a.val |  |
 | variables.rs:494:5:494:9 | a.val | variables.rs:494:13:494:13 | 5 |  |
 | variables.rs:494:5:494:13 | ... = ... | variables.rs:495:5:495:26 | ExprStmt |  |
@@ -1104,8 +1104,8 @@ edges
 | variables.rs:495:5:495:13 | print_i64 | variables.rs:495:15:495:15 | a |  |
 | variables.rs:495:5:495:25 | print_i64(...) | variables.rs:496:5:496:28 | ExprStmt |  |
 | variables.rs:495:5:495:26 | ExprStmt | variables.rs:495:5:495:13 | print_i64 |  |
-| variables.rs:495:15:495:15 | a | variables.rs:495:15:495:24 | ... .my_get(...) |  |
-| variables.rs:495:15:495:24 | ... .my_get(...) | variables.rs:495:5:495:25 | print_i64(...) |  |
+| variables.rs:495:15:495:15 | a | variables.rs:495:15:495:24 | a.my_get(...) |  |
+| variables.rs:495:15:495:24 | a.my_get(...) | variables.rs:495:5:495:25 | print_i64(...) |  |
 | variables.rs:496:5:496:5 | a | variables.rs:496:25:496:25 | 2 |  |
 | variables.rs:496:5:496:27 | ... = ... | variables.rs:497:5:497:26 | ExprStmt |  |
 | variables.rs:496:5:496:28 | ExprStmt | variables.rs:496:5:496:5 | a |  |
@@ -1114,8 +1114,8 @@ edges
 | variables.rs:497:5:497:13 | print_i64 | variables.rs:497:15:497:15 | a |  |
 | variables.rs:497:5:497:25 | print_i64(...) | variables.rs:491:14:498:1 | { ... } |  |
 | variables.rs:497:5:497:26 | ExprStmt | variables.rs:497:5:497:13 | print_i64 |  |
-| variables.rs:497:15:497:15 | a | variables.rs:497:15:497:24 | ... .my_get(...) |  |
-| variables.rs:497:15:497:24 | ... .my_get(...) | variables.rs:497:5:497:25 | print_i64(...) |  |
+| variables.rs:497:15:497:15 | a | variables.rs:497:15:497:24 | a.my_get(...) |  |
+| variables.rs:497:15:497:24 | a.my_get(...) | variables.rs:497:5:497:25 | print_i64(...) |  |
 | variables.rs:500:1:507:1 | enter fn arrays | variables.rs:501:5:501:26 | let ... = ... |  |
 | variables.rs:500:1:507:1 | exit fn arrays (normal) | variables.rs:500:1:507:1 | exit fn arrays |  |
 | variables.rs:500:13:507:1 | { ... } | variables.rs:500:1:507:1 | exit fn arrays (normal) |  |
@@ -1197,8 +1197,8 @@ edges
 | variables.rs:529:7:529:11 | a | variables.rs:530:3:530:10 | ExprStmt | match |
 | variables.rs:529:15:529:33 | MyStruct {...} | variables.rs:529:7:529:11 | a |  |
 | variables.rs:529:31:529:31 | 1 | variables.rs:529:15:529:33 | MyStruct {...} |  |
-| variables.rs:530:3:530:3 | a | variables.rs:530:3:530:9 | ... .bar(...) |  |
-| variables.rs:530:3:530:9 | ... .bar(...) | variables.rs:532:3:532:19 | ExprStmt |  |
+| variables.rs:530:3:530:3 | a | variables.rs:530:3:530:9 | a.bar(...) |  |
+| variables.rs:530:3:530:9 | a.bar(...) | variables.rs:532:3:532:19 | ExprStmt |  |
 | variables.rs:530:3:530:10 | ExprStmt | variables.rs:530:3:530:3 | a |  |
 | variables.rs:532:3:532:11 | print_i64 | variables.rs:532:13:532:13 | a |  |
 | variables.rs:532:3:532:18 | print_i64(...) | variables.rs:528:30:533:1 | { ... } |  |