Rust: accept test changes

Paolo Tranquilli · Paolo Tranquilli · commit c2b426df768b · 2024-11-21T12:54:13.000+01:00
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -3,13 +3,13 @@ canonicalPaths
 | canonical_paths.rs:2:5:3:22 | Struct | repo::test | crate::canonical_paths::a::Struct |
 | canonical_paths.rs:5:5:7:5 | trait Trait | repo::test | crate::canonical_paths::a::Trait |
 | canonical_paths.rs:6:9:6:20 | fn f | repo::test | crate::canonical_paths::a::Trait::f |
-| canonical_paths.rs:9:5:11:5 | impl Trait for Struct { ... } | None | None |
+| canonical_paths.rs:9:5:11:5 | impl <Trait> for <Struct> { ... } | None | None |
 | canonical_paths.rs:10:9:10:22 | fn f | repo::test | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
-| canonical_paths.rs:13:5:15:5 | impl Struct { ... } | None | None |
+| canonical_paths.rs:13:5:15:5 | impl <Struct> { ... } | None | None |
 | canonical_paths.rs:14:9:14:22 | fn g | repo::test | <crate::canonical_paths::a::Struct>::g |
 | canonical_paths.rs:17:5:19:5 | trait TraitWithBlanketImpl | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl |
 | canonical_paths.rs:18:9:18:20 | fn h | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl::h |
-| canonical_paths.rs:21:5:23:5 | impl TraitWithBlanketImpl for T { ... } | None | None |
+| canonical_paths.rs:21:5:23:5 | impl <TraitWithBlanketImpl> for <T> { ... } | None | None |
 | canonical_paths.rs:22:9:22:22 | fn h | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
 | canonical_paths.rs:25:5:25:16 | fn free | repo::test | crate::canonical_paths::a::free |
 | canonical_paths.rs:27:5:33:5 | fn usage | repo::test | crate::canonical_paths::a::usage |
@@ -19,11 +19,11 @@ canonicalPaths
 | canonical_paths.rs:40:9:40:27 | Struct | repo::test | {34}::OtherStruct |
 | canonical_paths.rs:42:9:44:9 | trait OtherTrait | repo::test | {34}::OtherTrait |
 | canonical_paths.rs:43:13:43:24 | fn g | repo::test | {34}::OtherTrait::g |
-| canonical_paths.rs:46:9:48:9 | impl OtherTrait for OtherStruct { ... } | None | None |
+| canonical_paths.rs:46:9:48:9 | impl <OtherTrait> for <OtherStruct> { ... } | None | None |
 | canonical_paths.rs:47:13:47:26 | fn g | repo::test | <{34}::OtherStruct as {34}::OtherTrait>::g |
-| canonical_paths.rs:50:9:52:9 | impl OtherTrait for crate::canonical_paths::a::Struct { ... } | None | None |
+| canonical_paths.rs:50:9:52:9 | impl <OtherTrait> for <...::Struct> { ... } | None | None |
 | canonical_paths.rs:51:13:51:26 | fn g | repo::test | <crate::canonical_paths::a::Struct as {34}::OtherTrait>::g |
-| canonical_paths.rs:54:9:56:9 | impl crate::canonical_paths::a::Trait for OtherStruct { ... } | None | None |
+| canonical_paths.rs:54:9:56:9 | impl <...::Trait> for <OtherStruct> { ... } | None | None |
 | canonical_paths.rs:55:13:55:26 | fn f | repo::test | <{34}::OtherStruct as crate::canonical_paths::a::Trait>::f |
 | canonical_paths.rs:58:9:60:9 | fn nested | repo::test | {34}::nested |
 | canonical_paths.rs:59:13:59:31 | Struct | repo::test | {35}::OtherStruct |
@@ -48,19 +48,19 @@ resolvedPaths
 | canonical_paths.rs:31:9:31:13 | ... .h(...) | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
 | canonical_paths.rs:32:9:32:12 | free | repo::test | crate::canonical_paths::a::free |
 | canonical_paths.rs:37:9:37:13 | super | repo::test | crate::canonical_paths |
-| canonical_paths.rs:37:9:37:16 | super::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:37:9:37:23 | super::a::Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:37:9:37:16 | ...::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:37:9:37:23 | ...::Trait | repo::test | crate::canonical_paths::a::Trait |
 | canonical_paths.rs:46:14:46:23 | OtherTrait | repo::test | {34}::OtherTrait |
 | canonical_paths.rs:46:29:46:39 | OtherStruct | repo::test | {34}::OtherStruct |
 | canonical_paths.rs:50:14:50:23 | OtherTrait | repo::test | {34}::OtherTrait |
 | canonical_paths.rs:50:29:50:33 | crate | None | None |
-| canonical_paths.rs:50:29:50:50 | crate::canonical_paths | repo::test | crate::canonical_paths |
-| canonical_paths.rs:50:29:50:53 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:50:29:50:61 | crate::canonical_paths::a::Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:50:29:50:50 | ...::canonical_paths | repo::test | crate::canonical_paths |
+| canonical_paths.rs:50:29:50:53 | ...::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:50:29:50:61 | ...::Struct | repo::test | crate::canonical_paths::a::Struct |
 | canonical_paths.rs:54:14:54:18 | crate | None | None |
-| canonical_paths.rs:54:14:54:35 | crate::canonical_paths | repo::test | crate::canonical_paths |
-| canonical_paths.rs:54:14:54:38 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:54:14:54:45 | crate::canonical_paths::a::Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:54:14:54:35 | ...::canonical_paths | repo::test | crate::canonical_paths |
+| canonical_paths.rs:54:14:54:38 | ...::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:54:14:54:45 | ...::Trait | repo::test | crate::canonical_paths::a::Trait |
 | canonical_paths.rs:54:51:54:61 | OtherStruct | repo::test | {34}::OtherStruct |
 | canonical_paths.rs:63:21:63:31 | OtherStruct | repo::test | {34}::OtherStruct |
 | canonical_paths.rs:64:13:64:13 | s | None | None |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
@@ -1,3 +1,3 @@
 | gen_block_expr.rs:3:28:12:1 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
 | gen_block_expr.rs:5:5:7:5 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
-| gen_block_expr.rs:8:5:11:5 | ''label: { ... } | hasLabel: | yes | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | hasLabel: | yes | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
@@ -1 +1 @@
-| gen_block_expr.rs:8:5:11:5 | ''label: { ... } | gen_block_expr.rs:8:5:8:11 | ''label |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:5:8:11 | 'label |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
@@ -1,3 +1,3 @@
 | gen_block_expr.rs:3:28:12:1 | { ... } | gen_block_expr.rs:3:28:12:1 | StmtList |
 | gen_block_expr.rs:5:5:7:5 | { ... } | gen_block_expr.rs:5:5:7:5 | StmtList |
-| gen_block_expr.rs:8:5:11:5 | ''label: { ... } | gen_block_expr.rs:8:13:11:5 | StmtList |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:13:11:5 | StmtList |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
@@ -1,2 +1,2 @@
 | gen_box_pat.rs:6:9:6:27 | box ... | hasPat: | yes |
-| gen_box_pat.rs:7:9:7:24 | box Option::None | hasPat: | yes |
+| gen_box_pat.rs:7:9:7:24 | box ...::None | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
@@ -1,2 +1,2 @@
 | gen_box_pat.rs:6:9:6:27 | box ... | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
-| gen_box_pat.rs:7:9:7:24 | box Option::None | gen_box_pat.rs:7:13:7:24 | Option::None |
+| gen_box_pat.rs:7:9:7:24 | box ...::None | gen_box_pat.rs:7:13:7:24 | ...::None |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | value as u64 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTy: | yes |
+| gen_cast_expr.rs:5:5:5:16 | value as <u64> | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | value as u64 | gen_cast_expr.rs:5:5:5:9 | value |
+| gen_cast_expr.rs:5:5:5:16 | value as <u64> | gen_cast_expr.rs:5:5:5:9 | value |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | value as u64 | gen_cast_expr.rs:5:14:5:16 | u64 |
+| gen_cast_expr.rs:5:5:5:16 | value as <u64> | gen_cast_expr.rs:5:14:5:16 | <u64> |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
@@ -1,2 +1,2 @@
 | gen_continue_expr.rs:7:13:7:20 | continue | getNumberOfAttrs: | 0 | hasLifetime: | no |
-| gen_continue_expr.rs:12:13:12:27 | continue ''label | getNumberOfAttrs: | 0 | hasLifetime: | yes |
+| gen_continue_expr.rs:12:13:12:27 | continue 'label | getNumberOfAttrs: | 0 | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
@@ -1 +1 @@
-| gen_continue_expr.rs:12:13:12:27 | continue ''label | gen_continue_expr.rs:12:22:12:27 | ''label |
+| gen_continue_expr.rs:12:13:12:27 | continue 'label | gen_continue_expr.rs:12:22:12:27 | ''label |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.expected b/rust/ql/test/extractor-tests/generated/Label/Label.expected
@@ -1 +1 @@
-| gen_label.rs:5:5:5:11 | ''label | hasLifetime: | yes |
+| gen_label.rs:5:5:5:11 | 'label | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
@@ -1 +1 @@
-| gen_label.rs:5:5:5:11 | ''label | gen_label.rs:5:5:5:10 | ''label |
+| gen_label.rs:5:5:5:11 | 'label | gen_label.rs:5:5:5:10 | ''label |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
@@ -3,4 +3,4 @@
 | gen_let_stmt.rs:7:5:7:15 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
 | gen_let_stmt.rs:8:5:8:10 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | no |
 | gen_let_stmt.rs:9:5:9:24 | let ... = ... | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else { ... } | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTy: | no |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
@@ -1,4 +1,4 @@
 | gen_let_stmt.rs:5:5:5:15 | let ... = 42 | gen_let_stmt.rs:5:13:5:14 | 42 |
 | gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:18:6:19 | 42 |
 | gen_let_stmt.rs:9:5:9:24 | let ... = ... | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else { ... } | gen_let_stmt.rs:10:19:10:38 | std::env::var(...) |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:19:10:38 | ...::var(...) |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
@@ -1 +1 @@
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else { ... } | gen_let_stmt.rs:10:40:12:5 | else { ... } |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:40:12:5 | else {...} |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
@@ -3,4 +3,4 @@
 | gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:9:7:9 | x |
 | gen_let_stmt.rs:8:5:8:10 | let ... | gen_let_stmt.rs:8:9:8:9 | x |
 | gen_let_stmt.rs:9:5:9:24 | let ... = ... | gen_let_stmt.rs:9:9:9:14 | TuplePat |
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else { ... } | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
@@ -1,2 +1,2 @@
-| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:12:6:14 | i32 |
-| gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:12:7:14 | i32 |
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:12:6:14 | <i32> |
+| gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:12:7:14 | <i32> |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
@@ -1,3 +1,3 @@
 | gen_loop_expr.rs:5:5:7:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
-| gen_loop_expr.rs:8:5:11:5 | ''label: loop { ... } | hasLabel: | yes | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | hasLabel: | yes | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
 | gen_loop_expr.rs:13:5:19:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
@@ -1 +1 @@
-| gen_loop_expr.rs:8:5:11:5 | ''label: loop { ... } | gen_loop_expr.rs:8:5:8:11 | ''label |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | gen_loop_expr.rs:8:5:8:11 | 'label |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
@@ -1,3 +1,3 @@
 | gen_loop_expr.rs:5:5:7:5 | loop { ... } | gen_loop_expr.rs:5:10:7:5 | { ... } |
-| gen_loop_expr.rs:8:5:11:5 | ''label: loop { ... } | gen_loop_expr.rs:8:18:11:5 | { ... } |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | gen_loop_expr.rs:8:18:11:5 | { ... } |
 | gen_loop_expr.rs:13:5:19:5 | loop { ... } | gen_loop_expr.rs:13:10:19:5 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
@@ -1,4 +1,4 @@
 | gen_match_arm.rs:6:9:6:29 | ... => y | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
-| gen_match_arm.rs:7:9:7:26 | Option::None => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
 | gen_match_arm.rs:10:9:10:35 | ... if ... => ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | yes | hasPat: | yes |
 | gen_match_arm.rs:11:9:11:15 | _ => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
@@ -1,4 +1,4 @@
 | gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:28:6:28 | y |
-| gen_match_arm.rs:7:9:7:26 | Option::None => 0 | gen_match_arm.rs:7:25:7:25 | 0 |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | gen_match_arm.rs:7:25:7:25 | 0 |
 | gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:30:10:34 | ... / ... |
 | gen_match_arm.rs:11:9:11:15 | _ => 0 | gen_match_arm.rs:11:14:11:14 | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
@@ -1,4 +1,4 @@
 | gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:9:6:23 | TupleStructPat |
-| gen_match_arm.rs:7:9:7:26 | Option::None => 0 | gen_match_arm.rs:7:9:7:20 | Option::None |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | gen_match_arm.rs:7:9:7:20 | ...::None |
 | gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:9:10:15 | TupleStructPat |
 | gen_match_arm.rs:11:9:11:15 | _ => 0 | gen_match_arm.rs:11:9:11:9 | _ |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | gen_offset_of_expr.rs:5:25:5:30 | Struct |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | gen_offset_of_expr.rs:5:25:5:30 | <Struct> |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
@@ -1 +1 @@
-| gen_or_pat.rs:6:9:6:38 | ... \| Option::None | getNumberOfPats: | 2 |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | getNumberOfPats: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
@@ -1,2 +1,2 @@
-| gen_or_pat.rs:6:9:6:38 | ... \| Option::None | 0 | gen_or_pat.rs:6:9:6:23 | TupleStructPat |
-| gen_or_pat.rs:6:9:6:38 | ... \| Option::None | 1 | gen_or_pat.rs:6:27:6:38 | Option::None |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 0 | gen_or_pat.rs:6:9:6:23 | TupleStructPat |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 1 | gen_or_pat.rs:6:27:6:38 | ...::None |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
@@ -1,2 +1,2 @@
 | gen_ref_pat.rs:6:9:6:28 | &mut ... | isMut: | yes | hasPat: | yes |
-| gen_ref_pat.rs:7:9:7:21 | &Option::None | isMut: | no | hasPat: | yes |
+| gen_ref_pat.rs:7:9:7:21 | &...::None | isMut: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
@@ -1,2 +1,2 @@
 | gen_ref_pat.rs:6:9:6:28 | &mut ... | gen_ref_pat.rs:6:14:6:28 | TupleStructPat |
-| gen_ref_pat.rs:7:9:7:21 | &Option::None | gen_ref_pat.rs:7:10:7:21 | Option::None |
+| gen_ref_pat.rs:7:9:7:21 | &...::None | gen_ref_pat.rs:7:10:7:21 | ...::None |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -17,7 +17,7 @@
 | utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
 | utf8_identifiers.rs:7:5:7:5 | \u03b4 |
 | utf8_identifiers.rs:7:5:7:13 | RecordField |
-| utf8_identifiers.rs:7:9:7:13 | usize |
+| utf8_identifiers.rs:7:9:7:13 | <usize> |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
@@ -1,12 +1,12 @@
 edges
 | test.rs:5:5:11:5 | enter fn test_and_if_let | test.rs:5:24:5:24 | a |  |
 | test.rs:5:5:11:5 | exit fn test_and_if_let (normal) | test.rs:5:5:11:5 | exit fn test_and_if_let |  |
-| test.rs:5:24:5:24 | a | test.rs:5:24:5:30 | ...: bool | match |
-| test.rs:5:24:5:30 | ...: bool | test.rs:5:33:5:33 | b |  |
-| test.rs:5:33:5:33 | b | test.rs:5:33:5:47 | ...: Option::<...> | match |
-| test.rs:5:33:5:47 | ...: Option::<...> | test.rs:5:50:5:50 | c |  |
-| test.rs:5:50:5:50 | c | test.rs:5:50:5:56 | ...: bool | match |
-| test.rs:5:50:5:56 | ...: bool | test.rs:6:12:6:12 | a |  |
+| test.rs:5:24:5:24 | a | test.rs:5:24:5:30 | ...: <bool> | match |
+| test.rs:5:24:5:30 | ...: <bool> | test.rs:5:33:5:33 | b |  |
+| test.rs:5:33:5:33 | b | test.rs:5:33:5:47 | ...: <Option::<...>> | match |
+| test.rs:5:33:5:47 | ...: <Option::<...>> | test.rs:5:50:5:50 | c |  |
+| test.rs:5:50:5:50 | c | test.rs:5:50:5:56 | ...: <bool> | match |
+| test.rs:5:50:5:56 | ...: <bool> | test.rs:6:12:6:12 | a |  |
 | test.rs:5:67:11:5 | { ... } | test.rs:5:5:11:5 | exit fn test_and_if_let (normal) |  |
 | test.rs:6:9:10:9 | if ... {...} else {...} | test.rs:5:67:11:5 | { ... } |  |
 | test.rs:6:12:6:12 | a | test.rs:6:12:6:31 | [boolean(false)] ... && ... | false |
@@ -24,12 +24,12 @@ edges
 | test.rs:9:13:9:17 | false | test.rs:8:16:10:9 | { ... } |  |
 | test.rs:13:5:21:5 | enter fn test_and_if_let2 | test.rs:13:25:13:25 | a |  |
 | test.rs:13:5:21:5 | exit fn test_and_if_let2 (normal) | test.rs:13:5:21:5 | exit fn test_and_if_let2 |  |
-| test.rs:13:25:13:25 | a | test.rs:13:25:13:31 | ...: bool | match |
-| test.rs:13:25:13:31 | ...: bool | test.rs:13:34:13:34 | b |  |
-| test.rs:13:34:13:34 | b | test.rs:13:34:13:39 | ...: i64 | match |
-| test.rs:13:34:13:39 | ...: i64 | test.rs:13:42:13:42 | c |  |
-| test.rs:13:42:13:42 | c | test.rs:13:42:13:48 | ...: bool | match |
-| test.rs:13:42:13:48 | ...: bool | test.rs:14:12:14:12 | a |  |
+| test.rs:13:25:13:25 | a | test.rs:13:25:13:31 | ...: <bool> | match |
+| test.rs:13:25:13:31 | ...: <bool> | test.rs:13:34:13:34 | b |  |
+| test.rs:13:34:13:34 | b | test.rs:13:34:13:39 | ...: <i64> | match |
+| test.rs:13:34:13:39 | ...: <i64> | test.rs:13:42:13:42 | c |  |
+| test.rs:13:42:13:42 | c | test.rs:13:42:13:48 | ...: <bool> | match |
+| test.rs:13:42:13:48 | ...: <bool> | test.rs:14:12:14:12 | a |  |
 | test.rs:13:59:21:5 | { ... } | test.rs:13:5:21:5 | exit fn test_and_if_let2 (normal) |  |
 | test.rs:14:9:20:9 | if ... {...} else {...} | test.rs:13:59:21:5 | { ... } |  |
 | test.rs:14:12:14:12 | a | test.rs:14:12:14:25 | [boolean(false)] ... && ... | false |

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| gen_block_expr.rs:8:5:11:5 \| ''label: { ... } \| gen_block_expr.rs:8:5:8:11 \| ''label \|`
	`1`	`+\| gen_block_expr.rs:8:5:11:5 \| 'label: { ... } \| gen_block_expr.rs:8:5:8:11 \| 'label \|`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`\| gen_box_pat.rs:6:9:6:27 \| box ... \| hasPat: \| yes \|`
`2`		`-\| gen_box_pat.rs:7:9:7:24 \| box Option::None \| hasPat: \| yes \|`
	`2`	`+\| gen_box_pat.rs:7:9:7:24 \| box ...::None \| hasPat: \| yes \|`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`\| gen_box_pat.rs:6:9:6:27 \| box ... \| gen_box_pat.rs:6:13:6:27 \| TupleStructPat \|`
`2`		`-\| gen_box_pat.rs:7:9:7:24 \| box Option::None \| gen_box_pat.rs:7:13:7:24 \| Option::None \|`
	`2`	`+\| gen_box_pat.rs:7:9:7:24 \| box ...::None \| gen_box_pat.rs:7:13:7:24 \| ...::None \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| gen_cast_expr.rs:5:5:5:16 \| value as u64 \| getNumberOfAttrs: \| 0 \| hasExpr: \| yes \| hasTy: \| yes \|`
	`1`	`+\| gen_cast_expr.rs:5:5:5:16 \| value as <u64> \| getNumberOfAttrs: \| 0 \| hasExpr: \| yes \| hasTy: \| yes \|`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`\| gen_continue_expr.rs:7:13:7:20 \| continue \| getNumberOfAttrs: \| 0 \| hasLifetime: \| no \|`
`2`		`-\| gen_continue_expr.rs:12:13:12:27 \| continue ''label \| getNumberOfAttrs: \| 0 \| hasLifetime: \| yes \|`
	`2`	`+\| gen_continue_expr.rs:12:13:12:27 \| continue 'label \| getNumberOfAttrs: \| 0 \| hasLifetime: \| yes \|`