Rust: update expected output

aibaars · aibaars · commit 796da126b8f4 · 2024-10-10T15:52:57.000+02:00
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | getNumberOfArgs: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | 0 | gen_arg_list.rs:5:5:5:11 | "not yet implemented" |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes |
+| gen_macro_call.rs:5:5:5:11 | MacroCall | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:11 | MacroStmts |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
@@ -1 +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 |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
@@ -1 +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 |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
@@ -1 +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 |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
@@ -1 +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 |
diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
@@ -1,4 +1,5 @@
 | lib.rs:3:9:3:8 | expected `;` or `{` |
 | lib.rs:3:9:3:8 | expected an item |
+| lib.rs:3:10:3:21 | macro expansion failed: could not resolve macro 'identifiers' |
 | lib.rs:3:21:3:20 | expected BANG |
 | lib.rs:3:21:3:20 | expected `{`, `[`, `(` |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
@@ -76,6 +76,8 @@ variable
 | variables.rs:366:13:366:13 | x |
 | variables.rs:367:13:367:15 | cap |
 variableAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
@@ -183,6 +185,8 @@ variableWriteAccess
 | variables.rs:278:9:278:10 | b4 | variables.rs:269:13:269:14 | b4 |
 | variables.rs:279:9:279:11 | a10 | variables.rs:268:13:268:15 | a10 |
 variableReadAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:20:15:20:16 | x2 | variables.rs:17:13:17:14 | x2 |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
@@ -1,11 +1,11 @@
 use std::ops::AddAssign;
 
-fn print_str(s: &str) {
-    println!("{}", s);
+fn print_str(s: &str) { // s
+    println!("{}", s); // $ read_access=s
 }
 
-fn print_i64(i: i64) {
-    println!("{}", i);
+fn print_i64(i: i64) { // i
+    println!("{}", i); // $ read_access=i
 }
 
 fn immutable_variable() {
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -4,3 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
 | does_not_compile.rs:2:32:2:31 | expected field name or number |
+| error.rs:2:5:2:17 | An error! |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
@@ -4,3 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction failed in does_not_compile.rs with error expected SEMICOLON | 2 |
 | does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction failed in does_not_compile.rs with error expected field name or number | 2 |
+| error.rs:2:5:2:17 | An error! | Extraction failed in error.rs with error An error! | 2 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 290 |
+| Elements extracted | 380 |
 | Elements unextracted | 0 |
 | Files extracted | 7 |
 | Lines of code extracted | 61 |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -1,10 +1,34 @@
+| main.rs:14:14:14:24 | ExprStmt | This code is never reached. |
+| main.rs:17:18:17:28 | ExprStmt | This code is never reached. |
+| main.rs:20:14:20:24 | ExprStmt | This code is never reached. |
+| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
+| main.rs:21:5:21:19 | ExprStmt | This code is never reached. |
+| main.rs:39:14:39:24 | ExprStmt | This code is never reached. |
+| main.rs:48:14:48:24 | ExprStmt | This code is never reached. |
+| main.rs:56:14:56:24 | ExprStmt | This code is never reached. |
+| main.rs:60:14:60:24 | ExprStmt | This code is never reached. |
+| main.rs:68:14:68:24 | ExprStmt | This code is never reached. |
+| main.rs:94:14:94:45 | ExprStmt | This code is never reached. |
+| main.rs:97:14:97:38 | ExprStmt | This code is never reached. |
+| main.rs:99:14:99:38 | ExprStmt | This code is never reached. |
+| main.rs:112:14:112:32 | ExprStmt | This code is never reached. |
+| main.rs:117:18:117:33 | ExprStmt | This code is never reached. |
+| main.rs:171:18:171:29 | ExprStmt | This code is never reached. |
+| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
+| main.rs:176:9:176:24 | ExprStmt | This code is never reached. |
+| main.rs:332:11:332:51 | ExprStmt | This code is never reached. |
 | unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
 | unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:66:10:66:19 | ExprStmt | This code is never reached. |
+| unreachable.rs:100:16:100:23 | ExprStmt | This code is never reached. |
 | unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:102:16:102:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:108:15:108:22 | ExprStmt | This code is never reached. |
 | unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:110:15:110:22 | ExprStmt | This code is never reached. |
 | unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
 | unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,10 +1,7 @@
 | main.rs:25:9:25:9 | a | Variable is not used. |
 | main.rs:90:13:90:13 | d | Variable is not used. |
-| main.rs:114:9:114:9 | k | Variable is not used. |
 | main.rs:141:5:141:5 | y | Variable is not used. |
 | main.rs:164:9:164:9 | x | Variable is not used. |
-| main.rs:169:9:169:9 | x | Variable is not used. |
-| main.rs:174:9:174:9 | x | Variable is not used. |
 | main.rs:202:17:202:17 | a | Variable is not used. |
 | main.rs:210:20:210:22 | val | Variable is not used. |
 | main.rs:223:14:223:16 | val | Variable is not used. |

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| gen_arg_list.rs:5:5:5:11 \| ArgList \| getNumberOfArgs: \| 1 \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| gen_macro_call.rs:5:5:5:11 \| MacroCall \| getNumberOfAttrs: \| 0 \| hasPath: \| yes \| hasTokenTree: \| yes \|`
	`1`	`+\| gen_macro_call.rs:5:5:5:11 \| MacroCall \| getNumberOfAttrs: \| 0 \| hasPath: \| yes \| hasTokenTree: \| yes \| hasExpanded: \| yes \|`