Rust: aggregate projects into workspaces

2026-05-04 13:15:21 +02:00 · 2025-01-15 17:17:19 +01:00
parent 02ac61f328
commit 3c064284b0
31 changed files with 722 additions and 30 deletions
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -515,7 +515,7 @@ lib/codeql/rust/elements/internal/generated/ExternBlock.qll c292d804a1f8d2cf6a44
 lib/codeql/rust/elements/internal/generated/ExternCrate.qll 35fea4e810a896c1656adb4682c4c3bc20283768073e26ae064189ce310433c8 fc504dff79ba758d89b10cd5049539fbc766ee9862ff495066cea26abf0b5e0b
 lib/codeql/rust/elements/internal/generated/ExternItem.qll 749b064ad60f32197d5b85e25929afe18e56e12f567b73e21e43e2fdf4c447e3 e2c2d423876675cf2dae399ca442aef7b2860319da9bfadeff29f2c6946f8de7
 lib/codeql/rust/elements/internal/generated/ExternItemList.qll 6bc97fdae6c411cab5c501129c1d6c2321c1011cccb119515d75d07dc55c253b 6b5aa808025c0a4270cac540c07ba6faede1b3c70b8db5fd89ec5d46df9041b2
-lib/codeql/rust/elements/internal/generated/ExtractorStep.qll b83ce7f18009bdd36374260652c2a8a5cd5a9b5404a1c147bbec49ad251e43f3 e6e55595300126f9c5a6fd7bde5321b2a0026b491326114d16fcc2395a1fc483
+lib/codeql/rust/elements/internal/generated/ExtractorStep.qll 61cd504a1aab98b1c977ee8cff661258351d11ca1fec77038c0a17d359f5810e 5e57b50f3e8e3114a55159fb11a524c6944363f5f8a380abccc8b220dedc70ca
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll 3e506b5cb93793ec30f56bb637a600db869fcba6181b068516a671d55c362739 7bbf953696d763ad6b210f378f487ba85b875fa115b22c0c0508599a63633502
 lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb870fc4f18752001584d48b9df0734055a6ebb789331 7c51b0b13eb02f1286d3365e53a976ba2655c4dbd8e735bc11c8b205c829e1ee
 lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll d490ab9f2e3654d9abde18a06e534abd99ca62f518ca08670b696a97e9d5c592 01500319820f66cb4bbda6fe7c26270f76ea934efff4bb3cbf88e9b1e07e8be2
@@ -594,7 +594,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 51d1e9e683fc79dddbff
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll db71278eea846cffd8748f1650493822d95108609a5c055bfaed7af4f42011c1 fabbf440a40ff5b1e9da26a95d20db89fbe7d33717bbc4f02ef518fc9dfd1e54
+lib/codeql/rust/elements/internal/generated/Raw.qll c75c7811d041897c2d6aae1e0e55b46af6182565e1d0dd624062c5ca499e9325 79e6ded808f14dd622076b75d8e4985c7b90f2d5e964d0750519b510463b47ba
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll 2131b2cb336caa76170082e69776011bf02576bbfdd34ba68ca84af24209250a 39a2e3ec32352b594c43cc1295e0e8b3f9808173322d3d73cb7d48ef969d5565
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
--- a/rust/ql/integration-tests/hello-project/diagnostics.expected
+++ b/rust/ql/integration-tests/hello-project/diagnostics.expected
@@ -5,6 +5,10 @@
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
      },
+      "findManifests": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
      "loadManifest": {
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
--- 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 | 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) |
 | src/directory_module/mod.rs:0:0:0:0 | Parse(src/directory_module/mod.rs) |
--- 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 | 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) |
 | src/directory_module/mod.rs:0:0:0:0 | LoadSource(src/directory_module/mod.rs) |
--- a/rust/ql/integration-tests/hello-project/summary.expected
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 65 |
+| Elements extracted | 66 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 1 |
--- a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
@@ -5,6 +5,10 @@
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
      },
+      "findManifests": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
      "loadManifest": {
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
@@ -23,7 +27,7 @@
      }
    },
    "numberOfFiles": 4,
-    "numberOfManifests": 2
+    "numberOfManifests": 1
  },
  "severity": "note",
  "source": {
--- a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
@@ -5,6 +5,10 @@
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
      },
+      "findManifests": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
      "loadManifest": {
        "ms": "__REDACTED__",
        "pretty": "__REDACTED__"
--- a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
@@ -1,11 +1,11 @@
-| exe/Cargo.toml:0:0:0:0 | LoadManifest(exe/Cargo.toml) |
+| Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
 | exe/src/a_module.rs:0:0:0:0 | Extract(exe/src/a_module.rs) |
 | exe/src/a_module.rs:0:0:0:0 | LoadSource(exe/src/a_module.rs) |
 | exe/src/a_module.rs:0:0:0:0 | Parse(exe/src/a_module.rs) |
 | 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) |
-| lib/Cargo.toml:0:0:0:0 | LoadManifest(lib/Cargo.toml) |
+| 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) |
 | lib/src/a_module/mod.rs:0:0:0:0 | Parse(lib/src/a_module/mod.rs) |
--- 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 | 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) |
 | lib/src/a_module/mod.rs:0:0:0:0 | Parse(lib/src/a_module/mod.rs) |
--- 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 | 85 |
+| Elements extracted | 86 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
--- a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
@@ -14,6 +14,8 @@ module Impl {
  class ExtractorStep extends Generated::ExtractorStep {
    override string toString() {
      result = this.getAction() + "(" + this.getFile().getAbsolutePath() + ")"
+      or
+      not this.hasFile() and result = this.getAction()
    }

    /**
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll
@@ -29,12 +29,17 @@ module Generated {
    }

    /**
-     * Gets the file of this extractor step.
+     * Gets the file of this extractor step, if it exists.
     */
    File getFile() {
      result = Synth::convertExtractorStepToRaw(this).(Raw::ExtractorStep).getFile()
    }

+    /**
+     * Holds if `getFile()` exists.
+     */
+    final predicate hasFile() { exists(this.getFile()) }
+
    /**
     * Gets the duration ms of this extractor step.
     */
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -21,17 +21,17 @@ module Raw {
    /**
     * Gets the action of this extractor step.
     */
-    string getAction() { extractor_steps(this, result, _, _) }
+    string getAction() { extractor_steps(this, result, _) }

    /**
-     * Gets the file of this extractor step.
+     * Gets the file of this extractor step, if it exists.
     */
-    File getFile() { extractor_steps(this, _, result, _) }
+    File getFile() { extractor_step_files(this, result) }

    /**
     * Gets the duration ms of this extractor step.
     */
-    int getDurationMs() { extractor_steps(this, _, _, result) }
+    int getDurationMs() { extractor_steps(this, _, result) }
  }

  /**
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -128,10 +128,15 @@ locatable_locations(
 extractor_steps(
  unique int id: @extractor_step,
  string action: string ref,
-  int file: @file ref,
  int duration_ms: int ref
 );

+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
@locatable =
  @ast_node
 ;
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 404 |
+| Elements extracted | 405 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 7 |