Rust: update integration tests

aibaars · aibaars · commit e5b039702a1b · 2025-03-10T10:16:22.000+01:00
diff --git a/rust/ql/integration-tests/hello-project/diagnostics.expected b/rust/ql/integration-tests/hello-project/diagnostics.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-project/steps.cargo.expected b/rust/ql/integration-tests/hello-project/steps.cargo.expected
@@ -1,4 +1,5 @@
 | Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | src/directory_module/mod.rs:0:0:0:0 | Extract(src/directory_module/mod.rs) |
 | src/directory_module/mod.rs:0:0:0:0 | LoadSource(src/directory_module/mod.rs) |
diff --git a/rust/ql/integration-tests/hello-project/steps.rust-project.expected b/rust/ql/integration-tests/hello-project/steps.rust-project.expected
@@ -1,3 +1,4 @@
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | rust-project.json:0:0:0:0 | LoadManifest(rust-project.json) |
 | src/directory_module/mod.rs:0:0:0:0 | Extract(src/directory_module/mod.rs) |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 66 |
+| Elements extracted | 67 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 1 |
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
@@ -5,6 +5,7 @@
 | exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | LoadSource(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | lib/src/a_module/mod.rs:0:0:0:0 | Extract(lib/src/a_module/mod.rs) |
 | lib/src/a_module/mod.rs:0:0:0:0 | LoadSource(lib/src/a_module/mod.rs) |
diff --git a/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected b/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
@@ -4,6 +4,7 @@
 | exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | LoadSource(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | lib/src/a_module/mod.rs:0:0:0:0 | Extract(lib/src/a_module/mod.rs) |
 | lib/src/a_module/mod.rs:0:0:0:0 | LoadSource(lib/src/a_module/mod.rs) |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 86 |
+| Elements extracted | 87 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 86 |
+| Elements extracted | 87 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.ql b/rust/ql/integration-tests/options/cfg/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where exists(f.getLocation().getFile().getRelativePath())
 select f
diff --git a/rust/ql/integration-tests/options/features/functions.ql b/rust/ql/integration-tests/options/features/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where exists(f.getLocation().getFile().getRelativePath())
 select f
diff --git a/rust/ql/integration-tests/options/target/functions.ql b/rust/ql/integration-tests/options/target/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where exists(f.getLocation().getFile().getRelativePath())
 select f
diff --git a/rust/ql/integration-tests/workspace-with-glob/steps.expected b/rust/ql/integration-tests/workspace-with-glob/steps.expected
@@ -1,6 +1,7 @@
 | Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
 | exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
 | lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`\| Cargo.toml:0:0:0:0 \| LoadManifest(Cargo.toml) \|`
	`2`	`+\| file://:0:0:0:0 \| CrateGraph \|`
`2`	`3`	`\| file://:0:0:0:0 \| FindManifests \|`
`3`	`4`	`\| src/directory_module/mod.rs:0:0:0:0 \| Extract(src/directory_module/mod.rs) \|`
`4`	`5`	`\| src/directory_module/mod.rs:0:0:0:0 \| LoadSource(src/directory_module/mod.rs) \|`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+\| file://:0:0:0:0 \| CrateGraph \|`
`1`	`2`	`\| file://:0:0:0:0 \| FindManifests \|`
`2`	`3`	`\| rust-project.json:0:0:0:0 \| LoadManifest(rust-project.json) \|`
`3`	`4`	`\| src/directory_module/mod.rs:0:0:0:0 \| Extract(src/directory_module/mod.rs) \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-\| Elements extracted \| 66 \|`
	`1`	`+\| Elements extracted \| 67 \|`
`2`	`2`	`\| Elements unextracted \| 0 \|`
`3`	`3`	`\| Extraction errors \| 0 \|`
`4`	`4`	`\| Extraction warnings \| 1 \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-\| Elements extracted \| 86 \|`
	`1`	`+\| Elements extracted \| 87 \|`
`2`	`2`	`\| Elements unextracted \| 0 \|`
`3`	`3`	`\| Extraction errors \| 0 \|`
`4`	`4`	`\| Extraction warnings \| 0 \|`