suite: workaround for toml patching issue

Author: baflor

harness-suite/projects-rust/wgpu/huh.patch

@@ -27,19 +27,6 @@ index 32461ed..677d560 100644
      "naga/hlsl-snapshots",
      "player",
      "tests",
-diff --git a/naga/Cargo.toml b/naga/Cargo.toml
-index 4458405..0a28e01 100644
---- a/naga/Cargo.toml
-+++ b/naga/Cargo.toml
-@@ -74,7 +74,7 @@ hlsl-out-if-target-windows = []
- compact = []
- 
- [dependencies]
--arbitrary = { version = "1.4", features = ["derive"], optional = true }
-+arbitrary = { git = "https://github.com/rust-fuzz/arbitrary.git", rev = "ef80790c5bbcd24f342967e2388aa14f2c0d4a6b", features = ["derive"], optional = true }
- arrayvec.workspace = true
- bitflags.workspace = true
- bit-set.workspace = true
 diff --git a/naga/fuzz/Cargo.toml b/naga/fuzz/Cargo.toml
 index 5d8647f..e44f3e4 100644
 --- a/naga/fuzz/Cargo.toml

harness-suite/scripts/build-rust-harness.py

@@ -74,7 +74,13 @@ def replace_dep(name, dep, add_if_missing=False):
         if name not in deps and not add_if_missing:
             return
         was_optional = name in deps and not isinstance(deps[name], str) and deps[name].get("optional", None)
-        deps.update({name: make_inline(dep)})
+        if name in deps and not isinstance(deps[name], str):
+            deps[name].update(dep)
+            for k in list(deps[name].keys()):
+                if k not in dep:
+                    del deps[name][k]
+        else:
+            deps.update({name: make_inline(dep)})
         if was_optional is not None:
             deps[name]["optional"] = was_optional
 

harness-suite/suite-run.py

@@ -19,6 +19,7 @@
 DEFAULT_TIMEOUTS = ["8m", "22m", "1h30m", "2h"]
 parser.add_argument('--timeout', default=DEFAULT_TIMEOUTS[:], action='append')
 parser.add_argument('--cores-per-harness', default=8)
+parser.add_argument('--cores', default=None)
 parser.add_argument('--harness-dir', default="./out")
 parser.add_argument('--corpus-dir', default="./corpus")
 
@@ -30,6 +31,8 @@
 
 available_parallelism = math.ceil((os.cpu_count() or 1) * 0.98)
 cores_available = available_parallelism
+if args.cores:
+    cores_available = int(args.cores)
 cores_cond = asyncio.Condition()
 @contextlib.asynccontextmanager
 async def cores(n):