Rust: Update test expectations.

geoffw0 · geoffw0 · commit 1d815b16d65b · 2025-08-27T10:42:45.000+01:00
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
@@ -1,7 +1,5 @@
 instances
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAsmPiece
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 0 | gen_asm_expr.rs:7:39:7:47 | AsmOperandNamed |
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected
@@ -1,7 +1,5 @@
 instances
 | gen_const.rs:4:5:7:22 | Const | isConst: | yes | isDefault: | no | hasImplementation: | yes |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
@@ -1,7 +1,5 @@
 instances
 | gen_enum.rs:4:5:7:34 | enum E |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAbi
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | gen_extern_block.rs:7:5:7:14 | Abi |
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_crate.rs:4:5:7:23 | ExternCrate |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,12 +1,6 @@
 instances
 | gen_function.rs:3:1:4:38 | fn foo | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | yes |
 | gen_function.rs:7:5:7:13 | fn bar | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | no |
-getExtendedCanonicalPath
-| gen_function.rs:3:1:4:38 | fn foo | crate::gen_function::foo |
-| gen_function.rs:7:5:7:13 | fn bar | crate::gen_function::Trait::bar |
-getCrateOrigin
-| gen_function.rs:3:1:4:38 | fn foo | repo::test |
-| gen_function.rs:7:5:7:13 | fn bar | repo::test |
 getAttributeMacroExpansion
 getParamList
 | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:7:4:14 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
@@ -1,7 +1,5 @@
 instances
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | isConst: | no | isDefault: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAssocItemList
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | gen_impl.rs:7:29:9:5 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1,8 +1,6 @@
 instances
 | gen_macro_call.rs:7:5:7:29 | println!... |
 | gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getPath
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_def.rs:4:5:9:5 | MacroDef |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getArgs
 | gen_macro_def.rs:4:5:9:5 | MacroDef | gen_macro_def.rs:7:25:7:39 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_rules.rs:4:5:9:5 | MacroRules |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getName
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -8,8 +8,6 @@ getAttr
 getArg
 | gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | 0 | gen_method_call_expr.rs:5:11:5:12 | 42 |
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | 0 | gen_method_call_expr.rs:6:23:6:24 | 42 |
-getResolvedPath
-getResolvedCrateOrigin
 getGenericArgList
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -2,14 +2,6 @@ instances
 | gen_module.rs:3:1:4:8 | mod foo |
 | gen_module.rs:5:1:7:1 | mod bar |
 | lib.rs:1:1:1:19 | mod gen_module |
-getExtendedCanonicalPath
-| gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo |
-| gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar |
-| lib.rs:1:1:1:19 | mod gen_module | crate::gen_module |
-getCrateOrigin
-| gen_module.rs:3:1:4:8 | mod foo | repo::test |
-| gen_module.rs:5:1:7:1 | mod bar | repo::test |
-| lib.rs:1:1:1:19 | mod gen_module | repo::test |
 getAttributeMacroExpansion
 getAttr
 getItemList
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
@@ -5,8 +5,6 @@ instances
 | gen_path_expr.rs:7:13:7:20 | ...::foo |
 | gen_path_expr.rs:8:13:8:36 | ...::foo |
 | gen_path_pat.rs:5:11:5:11 | x |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:12 | ...::bar |
 | gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
@@ -1,6 +1,4 @@
 instances
 | gen_path_pat.rs:6:9:6:16 | ...::Bar |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:16 | ...::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.expected b/rust/ql/test/extractor-tests/generated/Static/Static.expected
@@ -1,7 +1,5 @@
 instances
 | gen_static.rs:4:5:7:23 | Static | isMut: | no | isStatic: | yes | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
@@ -1,7 +1,5 @@
 instances
 | gen_struct.rs:4:5:8:5 | struct Point |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
@@ -3,8 +3,6 @@ instances
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} |
 | gen_struct_expr.rs:7:5:7:22 | Foo {...} |
 | gen_struct_expr.rs:8:5:8:14 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_struct_expr.rs:5:17:5:34 | Foo {...} | gen_struct_expr.rs:5:17:5:19 | Foo |
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} | gen_struct_expr.rs:6:18:6:20 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
@@ -1,8 +1,6 @@
 instances
 | gen_struct_pat.rs:6:9:6:26 | Foo {...} |
 | gen_struct_pat.rs:7:9:7:18 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_struct_pat.rs:6:9:6:26 | Foo {...} | gen_struct_pat.rs:6:9:6:11 | Foo |
 | gen_struct_pat.rs:7:9:7:18 | Foo {...} | gen_struct_pat.rs:7:9:7:11 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -1,12 +1,6 @@
 instances
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | isAuto: | no | isUnsafe: | no |
 | gen_trait.rs:10:1:10:57 | trait Foo | isAuto: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | crate::gen_trait::Frobinizable |
-| gen_trait.rs:10:1:10:57 | trait Foo | crate::gen_trait::Foo |
-getCrateOrigin
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | repo::test |
-| gen_trait.rs:10:1:10:57 | trait Foo | repo::test |
 getAttributeMacroExpansion
 getAssocItemList
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:20:8:1 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
@@ -1,7 +1,5 @@
 instances
 | gen_trait_alias.rs:7:5:7:26 | TraitAlias |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
@@ -2,8 +2,6 @@ instances
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) |
 | gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
@@ -1,8 +1,6 @@
 instances
 | gen_type_alias.rs:4:5:5:26 | type Point | isDefault: | no |
 | gen_type_alias.rs:8:9:8:20 | type Output | isDefault: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected
@@ -1,7 +1,5 @@
 instances
 | gen_union.rs:4:5:7:32 | union U |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.expected b/rust/ql/test/extractor-tests/generated/Use/Use.expected
@@ -1,7 +1,5 @@
 instances
 | gen_use.rs:4:5:5:34 | use ...::HashMap |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getUseTree
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
@@ -2,8 +2,6 @@ instances
 | gen_variant.rs:7:14:7:14 | A |
 | gen_variant.rs:7:17:7:22 | B |
 | gen_variant.rs:7:25:7:36 | C |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttr
 getDiscriminant
 getFieldList
