Rust: accept test changes

Paolo Tranquilli · Paolo Tranquilli · commit a82d2672233e · 2024-11-21T16:03:56.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 <...::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 <...::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 |
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/GenericArgList/GenericArgList.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
@@ -1 +1 @@
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | getNumberOfGenericArgs: | 2 |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | getNumberOfGenericArgs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
@@ -1,2 +1,2 @@
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg |
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg |
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/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 | GenericArgList |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
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/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 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected

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 +1 @@`
`1`		`-\| gen_generic_arg_list.rs:5:10:5:21 \| GenericArgList \| getNumberOfGenericArgs: \| 2 \|`
	`1`	`+\| gen_generic_arg_list.rs:5:10:5:21 \| <...> \| getNumberOfGenericArgs: \| 2 \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| gen_method_call_expr.rs:6:5:6:25 \| ... .foo(...) \| gen_method_call_expr.rs:6:10:6:21 \| GenericArgList \|`
	`1`	`+\| gen_method_call_expr.rs:6:5:6:25 \| ... .foo(...) \| gen_method_call_expr.rs:6:10:6:21 \| <...> \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| gen_offset_of_expr.rs:5:5:5:38 \| OffsetOfExpr \| gen_offset_of_expr.rs:5:25:5:30 \| <Struct> \|`
	`1`	`+\| gen_offset_of_expr.rs:5:5:5:38 \| OffsetOfExpr \| gen_offset_of_expr.rs:5:25:5:30 \| Struct \|`