Merge branch 'main' into redsun82/rust-cargo-options

Paolo Tranquilli · Paolo Tranquilli · commit d9d37dc3419e · 2024-11-08T18:17:54.000+01:00
diff --git a/rust/ql/test/extractor-tests/canonical_path/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/canonical_path/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueCallEnclosingCallable
+| canonical_paths.rs:32:9:32:14 | CallExpr | Call should have one enclosing callable but has 0. |
+| canonical_paths.rs:66:13:66:20 | CallExpr | Call should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
@@ -1,7 +1,7 @@
 uniqueNodeLocation
+| file://:0:0:0:0 | ... .parent(...) | Node should have one location but has 0. |
+| file://:0:0:0:0 | ... .unwrap(...) | Node should have one location but has 0. |
 | file://:0:0:0:0 | BlockExpr | Node should have one location but has 0. |
-| file://:0:0:0:0 | MethodCallExpr | Node should have one location but has 0. |
-| file://:0:0:0:0 | MethodCallExpr | Node should have one location but has 0. |
 | file://:0:0:0:0 | Param | Node should have one location but has 0. |
 | file://:0:0:0:0 | PathExpr | Node should have one location but has 0. |
 missingLocation

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+uniqueCallEnclosingCallable`
	`2`	`+\| canonical_paths.rs:32:9:32:14 \| CallExpr \| Call should have one enclosing callable but has 0. \|`
	`3`	`+\| canonical_paths.rs:66:13:66:20 \| CallExpr \| Call should have one enclosing callable but has 0. \|`