Rust: use check_diagnostics improvements

rust/ql/integration-tests/conftest.py

@@ -17,10 +17,12 @@ def manifests(cwd):
 @pytest.fixture
 def rust_check_diagnostics(check_diagnostics):
     check_diagnostics.replacements += [
-        (r'"ms"\s*:\s*[0-9]+', '"ms": "REDACTED"'),
-        (r'"pretty"\s*:\s*"[0-9]+:[0-9]{2}:[0-9]{2}.[0-9]{3}"', '"pretty": "REDACTED"'),
+        ("Cargo.toml|rust-project.json", "<manifest-file>"),
     ]
-    check_diagnostics.skip += [
-        "attributes.steps",  # the order of the steps is not stable
+    check_diagnostics.redact += [
+        "attributes.summary.*.ms",
+        "attributes.summary.*.pretty",
+        "attributes.steps.ms",
     ]
+    check_diagnostics.sort = True  # the order of the steps is not stable
     return check_diagnostics

rust/ql/integration-tests/hello-project/diagnostics.expected

@@ -1,27 +1,89 @@
 {
   "attributes": {
+    "steps": [
+      {
+        "extract": "<test-root-directory>/src/directory_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/src/directory_module/nested_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/src/directory_module/not_loaded.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/src/file_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/src/directory_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/src/directory_module/nested_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/src/file_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "loadManifest": "<test-root-directory>/<manifest-file>",
+        "ms": "__REDACTED__"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/src/directory_module/mod.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/src/directory_module/nested_module.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/src/directory_module/not_loaded.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/src/file_module.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/src/main.rs"
+      }
+    ],
     "summary": {
       "numberOfFiles": 4,
       "numberOfManifests": 1,
       "totalDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalExtractDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalFetchFileDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalLoadDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalParseDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       }
     }
   },

rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected

@@ -1,27 +1,85 @@
 {
   "attributes": {
+    "steps": [
+      {
+        "extract": "<test-root-directory>/exe/src/a_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/exe/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/lib/src/a_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/lib/src/lib.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/exe/src/a_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/exe/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/lib/src/a_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/lib/src/lib.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "loadManifest": "<test-root-directory>/exe/<manifest-file>",
+        "ms": "__REDACTED__"
+      },
+      {
+        "loadManifest": "<test-root-directory>/lib/<manifest-file>",
+        "ms": "__REDACTED__"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/exe/src/a_module.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/exe/src/main.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/lib/src/a_module/mod.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/lib/src/lib.rs"
+      }
+    ],
     "summary": {
       "numberOfFiles": 4,
       "numberOfManifests": 2,
       "totalDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalExtractDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalFetchFileDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalLoadDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalParseDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       }
     }
   },

rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected

@@ -1,27 +1,81 @@
 {
   "attributes": {
+    "steps": [
+      {
+        "extract": "<test-root-directory>/exe/src/a_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/exe/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/lib/src/a_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "extract": "<test-root-directory>/lib/src/lib.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/exe/src/a_module.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/exe/src/main.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/lib/src/a_module/mod.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "fetchFile": "<test-root-directory>/lib/src/lib.rs",
+        "ms": "__REDACTED__"
+      },
+      {
+        "loadManifest": "<test-root-directory>/<manifest-file>",
+        "ms": "__REDACTED__"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/exe/src/a_module.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/exe/src/main.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/lib/src/a_module/mod.rs"
+      },
+      {
+        "ms": "__REDACTED__",
+        "parse": "<test-root-directory>/lib/src/lib.rs"
+      }
+    ],
     "summary": {
       "numberOfFiles": 4,
       "numberOfManifests": 1,
       "totalDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalExtractDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalFetchFileDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalLoadDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       },
       "totalParseDuration": {
-        "ms": "REDACTED",
-        "pretty": "REDACTED"
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
       }
     }
   },