diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected index 4855c264b2c7..667f3130968c 100644 --- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected +++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected @@ -1 +1 @@ -| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:7:5:9 | NameRef | +| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:7:5:9 | foo | diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected index c21fa43f4aae..62676019818d 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected +++ b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected @@ -1,2 +1,2 @@ -| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:4:4:6 | Name | -| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:8:7:10 | Name | +| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:4:4:6 | foo | +| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:8:7:10 | bar | diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected index 45273e9c8a41..b4168bbb7508 100644 --- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected +++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected @@ -1,2 +1,2 @@ -| gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | Name | -| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:9:10:9 | Name | +| gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | y | +| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:9:10:9 | y | diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected index f029d3ea015e..33685ad0aad9 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected @@ -1 +1 @@ -| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:8 | Path | +| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:8 | todo | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected index 33ab9edbb293..d6c0d90cd750 100644 --- 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 | MethodCallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | -| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | +| 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 | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected index 2ad859d74e46..e6fad5c36ec5 100644 --- 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 | MethodCallExpr | gen_method_call_expr.rs:5:10:5:13 | ArgList | -| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | gen_method_call_expr.rs:6:22:6:25 | ArgList | +| 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 | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected index 8f63b756ae44..8b2622f09abe 100644 --- 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 | MethodCallExpr | 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 | GenericArgList | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected index ac9aa15ebec6..ba9fb15a1139 100644 --- 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 | MethodCallExpr | gen_method_call_expr.rs:5:7:5:9 | NameRef | -| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | gen_method_call_expr.rs:6:7:6:9 | NameRef | +| 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 | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected index 16cc94b89925..0b82390293bd 100644 --- 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 | MethodCallExpr | gen_method_call_expr.rs:5:5:5:5 | PathExpr | -| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | gen_method_call_expr.rs:6:5:6:5 | PathExpr | +| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:5:5:5 | PathExpr | +| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:5:6:5 | PathExpr | diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected index 918f151e292c..cc295b1da89a 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected +++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected @@ -1,3 +1,3 @@ -| gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | Name | -| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | Name | -| lib.rs:1:1:1:15 | Module | lib.rs:1:5:1:14 | Name | +| gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | foo | +| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | bar | +| lib.rs:1:1:1:15 | Module | lib.rs:1:5:1:14 | gen_module | diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.expected b/rust/ql/test/extractor-tests/generated/Name/Name.expected index 38072342a84d..37d1c2e1dd4f 100644 --- a/rust/ql/test/extractor-tests/generated/Name/Name.expected +++ b/rust/ql/test/extractor-tests/generated/Name/Name.expected @@ -1,2 +1,2 @@ -| gen_name.rs:3:4:3:12 | Name | hasText: | yes | -| lib.rs:1:5:1:12 | Name | hasText: | yes | +| gen_name.rs:3:4:3:12 | test_name | hasText: | yes | +| lib.rs:1:5:1:12 | gen_name | hasText: | yes | diff --git a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected index edc4ae3244d0..9cee64fd236e 100644 --- a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected +++ b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected @@ -1,2 +1,2 @@ -| gen_name.rs:3:4:3:12 | Name | test_name | -| lib.rs:1:5:1:12 | Name | gen_name | +| gen_name.rs:3:4:3:12 | test_name | test_name | +| lib.rs:1:5:1:12 | gen_name | gen_name | diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected index d28b8224609f..2c0b9dffa4d2 100644 --- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected +++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected @@ -1,4 +1,4 @@ -| gen_name_ref.rs:5:5:5:8 | NameRef | hasText: | yes | -| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes | -| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes | -| gen_name_ref.rs:5:5:5:11 | NameRef | hasText: | yes | +| gen_name_ref.rs:5:5:5:8 | todo | hasText: | yes | +| gen_name_ref.rs:5:5:5:11 | $crate | hasText: | yes | +| gen_name_ref.rs:5:5:5:11 | panic | hasText: | yes | +| gen_name_ref.rs:5:5:5:11 | panicking | hasText: | yes | diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected index 8b41037f56d2..17f24a9cefe1 100644 --- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected +++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected @@ -1,4 +1,4 @@ -| gen_name_ref.rs:5:5:5:8 | NameRef | todo | -| gen_name_ref.rs:5:5:5:11 | NameRef | $crate | -| gen_name_ref.rs:5:5:5:11 | NameRef | panic | -| gen_name_ref.rs:5:5:5:11 | NameRef | panicking | +| gen_name_ref.rs:5:5:5:8 | todo | todo | +| gen_name_ref.rs:5:5:5:11 | $crate | $crate | +| gen_name_ref.rs:5:5:5:11 | panic | panic | +| gen_name_ref.rs:5:5:5:11 | panicking | panicking | diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected index f98fbf4969f1..bec224d18cee 100644 --- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected +++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected @@ -1 +1 @@ -| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | gen_offset_of_expr.rs:5:33:5:37 | NameRef | +| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | gen_offset_of_expr.rs:5:33:5:37 | field | diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected index aac69a7f4667..db093224b76b 100644 --- a/rust/ql/test/extractor-tests/generated/Path/Path.expected +++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected @@ -1,2 +1,2 @@ -| gen_path.rs:5:5:5:7 | Path | hasQualifier: | no | hasPart: | yes | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | -| gen_path.rs:5:5:5:12 | Path | hasQualifier: | yes | hasPart: | yes | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | +| gen_path.rs:5:5:5:7 | foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes | +| gen_path.rs:5:5:5:12 | foo::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes | diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected index 5d56b2fb3f77..0e05956ea897 100644 --- a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected +++ b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected @@ -1,2 +1,2 @@ -| gen_path.rs:5:5:5:7 | Path | gen_path.rs:5:5:5:7 | PathSegment | -| gen_path.rs:5:5:5:12 | Path | gen_path.rs:5:10:5:12 | PathSegment | +| gen_path.rs:5:5:5:7 | foo | gen_path.rs:5:5:5:7 | foo | +| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:10:5:12 | bar | diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected index 3d9554c43cd9..44aa2ca5a006 100644 --- a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected +++ b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected @@ -1 +1 @@ -| gen_path.rs:5:5:5:12 | Path | gen_path.rs:5:5:5:7 | Path | +| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:5:5:7 | foo | diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected index 8dd98e1fb0d7..39ec516064de 100644 --- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected @@ -1,4 +1,4 @@ -| gen_path_expr.rs:5:13:5:20 | PathExpr | gen_path_expr.rs:5:13:5:20 | Path | -| gen_path_expr.rs:6:13:6:20 | PathExpr | gen_path_expr.rs:6:13:6:20 | Path | -| gen_path_expr.rs:7:13:7:20 | PathExpr | gen_path_expr.rs:7:13:7:20 | Path | -| gen_path_expr.rs:8:13:8:35 | PathExpr | gen_path_expr.rs:8:13:8:35 | Path | +| gen_path_expr.rs:5:13:5:20 | PathExpr | gen_path_expr.rs:5:13:5:20 | variable | +| gen_path_expr.rs:6:13:6:20 | PathExpr | gen_path_expr.rs:6:13:6:20 | foo::bar | +| gen_path_expr.rs:7:13:7:20 | PathExpr | gen_path_expr.rs:7:13:7:20 | (no string representation) | +| gen_path_expr.rs:8:13:8:35 | PathExpr | gen_path_expr.rs:8:13:8:35 | (no string representation) | diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected index 11c280c85bb3..d48ba6549dba 100644 --- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected @@ -1 +1 @@ -| gen_path_pat.rs:6:9:6:16 | PathPat | gen_path_pat.rs:6:9:6:16 | Path | +| gen_path_pat.rs:6:9:6:16 | PathPat | gen_path_pat.rs:6:9:6:16 | Foo::Bar | diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected index d3edb17d535b..32042fc6a59d 100644 --- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected +++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected @@ -1,4 +1,4 @@ -| gen_path_segment.rs:5:5:5:8 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | -| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | -| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | -| gen_path_segment.rs:5:5:5:11 | PathSegment | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | +| gen_path_segment.rs:5:5:5:8 | todo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | +| gen_path_segment.rs:5:5:5:11 | $crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | +| gen_path_segment.rs:5:5:5:11 | panic | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | +| gen_path_segment.rs:5:5:5:11 | panicking | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no | diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected index 38207ad29282..28346240d296 100644 --- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected +++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected @@ -1,4 +1,4 @@ -| gen_path_segment.rs:5:5:5:8 | PathSegment | gen_path_segment.rs:5:5:5:8 | NameRef | -| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef | -| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef | -| gen_path_segment.rs:5:5:5:11 | PathSegment | gen_path_segment.rs:5:5:5:11 | NameRef | +| gen_path_segment.rs:5:5:5:8 | todo | gen_path_segment.rs:5:5:5:8 | todo | +| gen_path_segment.rs:5:5:5:11 | $crate | gen_path_segment.rs:5:5:5:11 | $crate | +| gen_path_segment.rs:5:5:5:11 | panic | gen_path_segment.rs:5:5:5:11 | panic | +| gen_path_segment.rs:5:5:5:11 | panicking | gen_path_segment.rs:5:5:5:11 | panicking | diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected index d027792d93ad..91d4f5cb0b56 100644 --- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected @@ -1,4 +1,4 @@ -| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:19 | Path | -| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:20 | Path | -| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:7 | Path | -| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:7 | Path | +| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:19 | Foo | +| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:20 | Foo | +| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:7 | Foo | +| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:7 | Foo | diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected index 14096d8b7cec..081e3ccac566 100644 --- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected +++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected @@ -1,2 +1,2 @@ -| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:11:5:11 | NameRef | -| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:17:5:17 | NameRef | +| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:11:5:11 | a | +| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:17:5:17 | b | diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected index a365bfa83d0f..a9e0be01d5b5 100644 --- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected @@ -1,2 +1,2 @@ -| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:11 | Path | -| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:11 | Path | +| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:11 | Foo | +| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:11 | Foo | diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected index cfc6515d79df..abbb171ae68d 100644 --- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected +++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected @@ -1,2 +1,2 @@ -| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:15:5:15 | NameRef | -| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:21:5:21 | NameRef | +| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:15:5:15 | a | +| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:21:5:21 | b | diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected index c9fbc3495f17..cc60a2ab9386 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected @@ -1,2 +1,2 @@ -| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:7:4:18 | Name | -| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:11:10:13 | Name | +| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:7:4:18 | Frobinizable | +| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:11:10:13 | Foo | diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected index e51529b2708f..0c07d081720e 100644 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected +++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected @@ -1,3 +1,3 @@ -| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:13 | Path | -| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:13 | Path | -| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:13 | Path | +| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple | +| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple | +| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:13 | Tuple | diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected index 5586f36b0ac0..dfc20f5ab58b 100644 --- a/rust/ql/test/extractor-tests/utf8/ast.expected +++ b/rust/ql/test/extractor-tests/utf8/ast.expected @@ -1,33 +1,33 @@ | lib.rs:1:1:1:21 | Module | | lib.rs:1:1:1:21 | SourceFile | -| lib.rs:1:5:1:20 | Name | +| lib.rs:1:5:1:20 | utf8_identifiers | | utf8_identifiers.rs:1:1:4:6 | foo | | utf8_identifiers.rs:1:1:12:2 | SourceFile | -| utf8_identifiers.rs:1:4:1:6 | Name | +| utf8_identifiers.rs:1:4:1:6 | foo | | utf8_identifiers.rs:1:7:4:1 | GenericParamList | | utf8_identifiers.rs:2:5:2:6 | Lifetime | | utf8_identifiers.rs:2:5:2:6 | LifetimeParam | -| utf8_identifiers.rs:3:5:3:5 | Name | | utf8_identifiers.rs:3:5:3:5 | TypeParam | +| utf8_identifiers.rs:3:5:3:5 | \u03b3 | | utf8_identifiers.rs:4:2:4:3 | ParamList | | utf8_identifiers.rs:4:5:4:6 | BlockExpr | | utf8_identifiers.rs:4:5:4:6 | StmtList | | utf8_identifiers.rs:6:1:8:1 | Struct | -| utf8_identifiers.rs:6:8:6:8 | Name | +| utf8_identifiers.rs:6:8:6:8 | X | | utf8_identifiers.rs:6:10:8:1 | RecordFieldList | -| utf8_identifiers.rs:7:5:7:5 | Name | +| utf8_identifiers.rs:7:5:7:5 | \u03b4 | | utf8_identifiers.rs:7:5:7:13 | RecordField | -| utf8_identifiers.rs:7:9:7:13 | NameRef | -| utf8_identifiers.rs:7:9:7:13 | Path | -| utf8_identifiers.rs:7:9:7:13 | PathSegment | | utf8_identifiers.rs:7:9:7:13 | PathType | +| 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:10:1:10:3 | Visibility | | utf8_identifiers.rs:10:1:12:1 | main | -| utf8_identifiers.rs:10:8:10:11 | Name | +| utf8_identifiers.rs:10:8:10:11 | main | | utf8_identifiers.rs:10:12:10:13 | ParamList | | utf8_identifiers.rs:10:15:12:1 | BlockExpr | | utf8_identifiers.rs:10:15:12:1 | StmtList | | utf8_identifiers.rs:11:5:11:24 | LetStmt | -| utf8_identifiers.rs:11:9:11:9 | Name | +| utf8_identifiers.rs:11:9:11:9 | \u03b1 | | utf8_identifiers.rs:11:9:11:9 | \u03b1 | | utf8_identifiers.rs:11:14:11:23 | 0.00001f64 | diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected index cdbf56592c9a..d67c92e29a06 100644 --- a/rust/ql/test/library-tests/controlflow/Cfg.expected +++ b/rust/ql/test/library-tests/controlflow/Cfg.expected @@ -20,10 +20,10 @@ edges | test.rs:11:23:11:34 | PathExpr | test.rs:11:23:11:36 | CallExpr | | | test.rs:11:23:11:36 | CallExpr | 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 | MethodCallExpr | test.rs:10:22:13:5 | BlockExpr | | +| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | BlockExpr | | | 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 | MethodCallExpr | | +| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | ... .insert(...) | | | test.rs:18:5:34:5 | enter test_break_and_continue | test.rs:18:32:18:32 | n | | | test.rs:18:5:34:5 | exit test_break_and_continue (normal) | test.rs:18:5:34:5 | exit test_break_and_continue | | | test.rs:18:32:18:32 | n | test.rs:18:32:18:37 | Param | match | @@ -173,8 +173,8 @@ edges | test.rs:91:19:91:25 | TupleStructPat | test.rs:91:9:95:9 | WhileExpr | no-match | | test.rs:91:19:91:25 | TupleStructPat | test.rs:91:24:91:24 | x | match | | test.rs:91:24:91:24 | x | test.rs:92:17:92:17 | PathExpr | match | -| test.rs:91:29:91:32 | iter | test.rs:91:29:91:39 | MethodCallExpr | | -| test.rs:91:29:91:39 | MethodCallExpr | test.rs:91:19:91:25 | TupleStructPat | | +| test.rs:91:29:91:32 | iter | test.rs:91:29:91:39 | ... .next(...) | | +| test.rs:91:29:91:39 | ... .next(...) | test.rs:91:19:91:25 | TupleStructPat | | | test.rs:91:41:95:9 | BlockExpr | test.rs:91:15:91:39 | LetExpr | | | test.rs:92:13:94:13 | IfExpr | test.rs:91:41:95:9 | BlockExpr | | | test.rs:92:17:92:17 | PathExpr | test.rs:92:21:92:21 | 5 | | @@ -576,8 +576,8 @@ edges | test.rs:269:38:269:38 | s | test.rs:269:38:269:44 | Param | match | | test.rs:269:38:269:44 | Param | test.rs:270:9:270:11 | PathExpr | | | test.rs:269:62:271:5 | BlockExpr | test.rs:269:5:271:5 | exit test_question_mark_operator_1 (normal) | | -| test.rs:270:9:270:11 | PathExpr | test.rs:270:9:270:26 | MethodCallExpr | | -| test.rs:270:9:270:26 | MethodCallExpr | test.rs:270:9:270:27 | TryExpr | | +| test.rs:270:9:270:11 | PathExpr | test.rs:270:9:270:26 | ... .parse(...) | | +| test.rs:270:9:270:26 | ... .parse(...) | test.rs:270:9:270:27 | TryExpr | | | test.rs:270:9:270:27 | TryExpr | test.rs:269:5:271:5 | exit test_question_mark_operator_1 (normal) | return | | test.rs:270:9:270:27 | TryExpr | test.rs:270:31:270:31 | 4 | match | | test.rs:270:9:270:31 | ... + ... | test.rs:269:62:271:5 | BlockExpr | | diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected index f9bd23630192..f608d82e32d0 100644 --- a/rust/ql/test/library-tests/variables/Cfg.expected +++ b/rust/ql/test/library-tests/variables/Cfg.expected @@ -735,11 +735,11 @@ edges | variables.rs:343:5:343:16 | CallExpr | variables.rs:344:5:344:28 | ExprStmt | | | variables.rs:343:5:343:17 | ExprStmt | variables.rs:343:5:343:13 | PathExpr | | | variables.rs:343:15:343:15 | a | variables.rs:343:5:343:16 | CallExpr | | -| variables.rs:344:5:344:27 | MethodCallExpr | variables.rs:345:5:345:17 | ExprStmt | | +| variables.rs:344:5:344:27 | ... .add_assign(...) | variables.rs:345:5:345:17 | ExprStmt | | | variables.rs:344:5:344:28 | ExprStmt | variables.rs:344:11:344:11 | a | | | variables.rs:344:6:344:11 | RefExpr | variables.rs:344:25:344:26 | 10 | | | variables.rs:344:11:344:11 | a | variables.rs:344:6:344:11 | RefExpr | | -| variables.rs:344:25:344:26 | 10 | variables.rs:344:5:344:27 | MethodCallExpr | | +| variables.rs:344:25:344:26 | 10 | variables.rs:344:5:344:27 | ... .add_assign(...) | | | variables.rs:345:5:345:13 | PathExpr | variables.rs:345:15:345:15 | a | | | variables.rs:345:5:345:16 | CallExpr | variables.rs:340:17:346:1 | BlockExpr | | | variables.rs:345:5:345:17 | ExprStmt | variables.rs:345:5:345:13 | PathExpr | | @@ -940,9 +940,9 @@ edges | variables.rs:428:24:430:5 | exit ClosureExpr (normal) | variables.rs:428:24:430:5 | exit ClosureExpr | | | variables.rs:428:27:430:5 | BlockExpr | variables.rs:428:24:430:5 | exit ClosureExpr (normal) | | | variables.rs:429:9:429:9 | z | variables.rs:429:22:429:22 | 1 | | -| variables.rs:429:9:429:23 | MethodCallExpr | variables.rs:428:27:430:5 | BlockExpr | | +| variables.rs:429:9:429:23 | ... .add_assign(...) | variables.rs:428:27:430:5 | BlockExpr | | | 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 | MethodCallExpr | | +| variables.rs:429:22:429:22 | 1 | variables.rs:429:9:429:23 | ... .add_assign(...) | | | variables.rs:431:5:431:12 | closure3 | variables.rs:431:5:431:14 | CallExpr | | | variables.rs:431:5:431:14 | CallExpr | variables.rs:432:5:432:17 | ExprStmt | | | variables.rs:431:5:431:15 | ExprStmt | variables.rs:431:5:431:12 | closure3 | | @@ -1059,8 +1059,8 @@ edges | variables.rs:479:5:479:13 | PathExpr | variables.rs:479:15:479:15 | a | | | variables.rs:479:5:479:25 | CallExpr | variables.rs:480:5:480:14 | ExprStmt | | | variables.rs:479:5:479:26 | ExprStmt | variables.rs:479:5:479:13 | PathExpr | | -| variables.rs:479:15:479:15 | a | variables.rs:479:15:479:24 | MethodCallExpr | | -| variables.rs:479:15:479:24 | MethodCallExpr | variables.rs:479:5:479:25 | CallExpr | | +| variables.rs:479:15:479:15 | a | variables.rs:479:15:479:24 | ... .my_get(...) | | +| variables.rs:479:15:479:24 | ... .my_get(...) | variables.rs:479:5:479:25 | CallExpr | | | variables.rs:480:5:480:5 | a | variables.rs:480:5:480:9 | FieldExpr | | | variables.rs:480:5:480:9 | FieldExpr | variables.rs:480:13:480:13 | 5 | | | variables.rs:480:5:480:13 | ... = ... | variables.rs:481:5:481:26 | ExprStmt | | @@ -1069,8 +1069,8 @@ edges | variables.rs:481:5:481:13 | PathExpr | variables.rs:481:15:481:15 | a | | | variables.rs:481:5:481:25 | CallExpr | variables.rs:482:5:482:28 | ExprStmt | | | variables.rs:481:5:481:26 | ExprStmt | variables.rs:481:5:481:13 | PathExpr | | -| variables.rs:481:15:481:15 | a | variables.rs:481:15:481:24 | MethodCallExpr | | -| variables.rs:481:15:481:24 | MethodCallExpr | variables.rs:481:5:481:25 | CallExpr | | +| variables.rs:481:15:481:15 | a | variables.rs:481:15:481:24 | ... .my_get(...) | | +| variables.rs:481:15:481:24 | ... .my_get(...) | variables.rs:481:5:481:25 | CallExpr | | | variables.rs:482:5:482:5 | a | variables.rs:482:25:482:25 | 2 | | | variables.rs:482:5:482:27 | ... = ... | variables.rs:483:5:483:26 | ExprStmt | | | variables.rs:482:5:482:28 | ExprStmt | variables.rs:482:5:482:5 | a | | @@ -1079,8 +1079,8 @@ edges | variables.rs:483:5:483:13 | PathExpr | variables.rs:483:15:483:15 | a | | | variables.rs:483:5:483:25 | CallExpr | variables.rs:477:14:484:1 | BlockExpr | | | variables.rs:483:5:483:26 | ExprStmt | variables.rs:483:5:483:13 | PathExpr | | -| variables.rs:483:15:483:15 | a | variables.rs:483:15:483:24 | MethodCallExpr | | -| variables.rs:483:15:483:24 | MethodCallExpr | variables.rs:483:5:483:25 | CallExpr | | +| variables.rs:483:15:483:15 | a | variables.rs:483:15:483:24 | ... .my_get(...) | | +| variables.rs:483:15:483:24 | ... .my_get(...) | variables.rs:483:5:483:25 | CallExpr | | | variables.rs:486:1:493:1 | enter ref_arg | variables.rs:487:5:487:15 | LetStmt | | | variables.rs:486:1:493:1 | exit ref_arg (normal) | variables.rs:486:1:493:1 | exit ref_arg | | | variables.rs:486:14:493:1 | BlockExpr | variables.rs:486:1:493:1 | exit ref_arg (normal) | | @@ -1120,8 +1120,8 @@ edges | variables.rs:506:7:506:11 | a | variables.rs:507:3:507:10 | ExprStmt | match | | variables.rs:506:15:506:33 | RecordExpr | variables.rs:506:7:506:11 | a | | | variables.rs:506:31:506:31 | 1 | variables.rs:506:15:506:33 | RecordExpr | | -| variables.rs:507:3:507:3 | a | variables.rs:507:3:507:9 | MethodCallExpr | | -| variables.rs:507:3:507:9 | MethodCallExpr | variables.rs:509:3:509:19 | ExprStmt | | +| variables.rs:507:3:507:3 | a | variables.rs:507:3:507:9 | ... .bar(...) | | +| variables.rs:507:3:507:9 | ... .bar(...) | variables.rs:509:3:509:19 | ExprStmt | | | variables.rs:507:3:507:10 | ExprStmt | variables.rs:507:3:507:3 | a | | | variables.rs:509:3:509:11 | PathExpr | variables.rs:509:13:509:13 | a | | | variables.rs:509:3:509:18 | CallExpr | variables.rs:505:30:510:1 | BlockExpr | |