Bring xtasks back into workspace

Author: cwfitzgerald

.cargo/config.toml

@@ -1,2 +1,2 @@
 [alias]
-xtask = "run --manifest-path xtask/Cargo.toml --"
+xtask = "run -p wgpu-xtask --"

.deny.toml

@@ -15,6 +15,11 @@ skip-tree = [
     { name = "capacity_builder", version = "0.1.3" },
 ]
 skip = [
+    # num-cpu uses an old version
+    { name = "hermit-abi", version = "0.3.9" },
+    # Deno uses an old version
+    { name = "which", version = "6.0.3" },
+
     # criterion uses an old version
     { name = "itertools", version = "0.10.5" },
     # bindgen (used by deno) uses old version

.github/workflows/ci.yml

@@ -535,7 +535,6 @@ jobs:
           key: test-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
           workspaces: |
             . -> target
-            xtask -> xtask/target
 
       - name: (Windows) Install DXC
         if: matrix.os == 'windows-2022'
@@ -751,8 +750,6 @@ jobs:
       - name: Run `cargo fmt`
         run: |
           cargo fmt -- --check
-          cargo fmt --manifest-path xtask/Cargo.toml -- --check
-          cargo fmt --manifest-path naga/xtask/Cargo.toml -- --check
 
       - name: Install Taplo
         uses: uncenter/setup-taplo@v1

.github/workflows/shaders.yml

@@ -42,9 +42,6 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            naga/xtask -> naga/xtask/target
 
       # We must have the FXC job before the DXC job, so the DXC PATH has priority
       # over the FXC PATH. This is because the windows kits also include an older
@@ -97,9 +94,6 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            naga/xtask -> naga/xtask/target
 
       - run: |
           cd naga
@@ -139,9 +133,6 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            naga/xtask -> naga/xtask/target
 
       - run: cd naga; cargo xtask validate spv
 

.gitignore

@@ -11,7 +11,6 @@
 target/
 # Include the root lockfile but not the others
 */Cargo.lock
-!xtask/Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk