Rust: integration-tests: update output

aibaars · hvitved · commit 2a93b2a499b5 · 2025-05-22T09:53:37.000+02:00
diff --git a/rust/ql/integration-tests/hello-project/diagnostics.expected b/rust/ql/integration-tests/hello-project/diagnostics.expected
@@ -9,6 +9,10 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "extractLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "findManifests": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
@@ -25,12 +29,16 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "parseLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "total": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       }
     },
-    "numberOfFiles": 6,
+    "numberOfFiles": 5,
     "numberOfManifests": 1
   },
   "severity": "note",
diff --git a/rust/ql/integration-tests/hello-project/steps.cargo.expected b/rust/ql/integration-tests/hello-project/steps.cargo.expected
@@ -1,6 +1,4 @@
 | Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
-| file:///types.rs:0:0:0:0 | Extract(/types.rs) |
-| file:///types.rs:0:0:0:0 | Parse(/types.rs) |
 | 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) |
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,5 +1,3 @@
-| file:///types.rs:0:0:0:0 | Extract(/types.rs) |
-| file:///types.rs:0:0:0:0 | Parse(/types.rs) |
 | file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | rust-project.json:0:0:0:0 | LoadManifest(rust-project.json) |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
@@ -9,7 +9,7 @@
 | Inconsistencies - Path resolution | 0 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 23 |
+| Lines of code extracted | 6 |
 | Lines of user code extracted | 6 |
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
@@ -9,6 +9,10 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "extractLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "findManifests": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
@@ -25,12 +29,16 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "parseLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "total": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       }
     },
-    "numberOfFiles": 5,
+    "numberOfFiles": 4,
     "numberOfManifests": 1
   },
   "severity": "note",
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
@@ -9,6 +9,10 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "extractLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "findManifests": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
@@ -25,12 +29,16 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "parseLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "total": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       }
     },
-    "numberOfFiles": 5,
+    "numberOfFiles": 4,
     "numberOfManifests": 1
   },
   "severity": "note",
diff --git a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
@@ -5,8 +5,6 @@
 | 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:///types.rs:0:0:0:0 | Extract(/types.rs) |
-| file:///types.rs:0:0:0:0 | Parse(/types.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) |
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,8 +4,6 @@
 | 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:///types.rs:0:0:0:0 | Extract(/types.rs) |
-| file:///types.rs:0:0:0:0 | Parse(/types.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) |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -9,7 +9,7 @@
 | Inconsistencies - Path resolution | 0 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 26 |
+| Lines of code extracted | 9 |
 | Lines of user code extracted | 9 |
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -9,7 +9,7 @@
 | Inconsistencies - Path resolution | 0 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 26 |
+| Lines of code extracted | 9 |
 | Lines of user code extracted | 9 |
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
diff --git a/rust/ql/integration-tests/macro-expansion/diagnostics.expected b/rust/ql/integration-tests/macro-expansion/diagnostics.expected
@@ -9,6 +9,10 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "extractLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "findManifests": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
@@ -25,12 +29,16 @@
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       },
+      "parseLibrary": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "total": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
       }
     },
-    "numberOfFiles": 3,
+    "numberOfFiles": 2,
     "numberOfManifests": 1
   },
   "severity": "note",
diff --git a/rust/ql/integration-tests/workspace-with-glob/steps.expected b/rust/ql/integration-tests/workspace-with-glob/steps.expected
@@ -1,8 +1,6 @@
 | 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:///types.rs:0:0:0:0 | Extract(/types.rs) |
-| file:///types.rs:0:0:0:0 | Parse(/types.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) |

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-\| file:///types.rs:0:0:0:0 \| Extract(/types.rs) \|`
`2`		`-\| file:///types.rs:0:0:0:0 \| Parse(/types.rs) \|`
`3`	`1`	`\| file://:0:0:0:0 \| CrateGraph \|`
`4`	`2`	`\| file://:0:0:0:0 \| FindManifests \|`
`5`	`3`	`\| rust-project.json:0:0:0:0 \| LoadManifest(rust-project.json) \|`