move cc-test & gen-windows-sys-binding into workspace

put these helper crates inside a new dev-tools directory to make it obvious what their purpose is
rust-lang · Jan 29, 2024 · 93524fb · 93524fb
1 parent 6320cf3
commit 93524fb
Show file tree

Hide file tree

Showing 31 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -86,11 +86,9 @@ jobs:
         sudo apt-get update
         sudo apt-get install g++-multilib
       if: matrix.build == 'linux32'
-    - run: cargo test ${{ matrix.no_run }}
-    - run: cargo test ${{ matrix.no_run }} --features parallel
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }}
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --features parallel
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --release
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }}
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --release
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --features parallel
 
   check-tvos:
     name: Test aarch64-apple-tvos
@@ -104,11 +102,9 @@ jobs:
         rustup component add rust-src --toolchain nightly
         rustup default nightly
       shell: bash
-    - run: cargo test -Z build-std=std --no-run --target aarch64-apple-tvos
-    - run: cargo test -Z build-std=std --no-run --features parallel --target aarch64-apple-tvos
-    - run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos
-    - run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos --features parallel
-    - run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos --release
+    - run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos
+    - run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos --release
+    - run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos --features parallel
 
   cuda:
     name: Test CUDA support
@@ -126,7 +122,7 @@ jobs:
     - name: Test 'cudart' feature
       shell: bash
       run: |
-        PATH="/usr/local/cuda/bin:$PATH" cargo test --manifest-path cc-test/Cargo.toml --features test_cuda
+        PATH="/usr/local/cuda/bin:$PATH" cargo test --manifest-path dev-tools/cc-test/Cargo.toml --features test_cuda
 
   msrv:
     name: MSRV
@@ -147,8 +143,8 @@ jobs:
       run: cargo +nightly update -Zminimal-versions
     - name: Cache downloaded crates since 1.53 is really slow in fetching
       uses: Swatinem/rust-cache@v2
-    - run: cargo check --lib
-    - run: cargo check --lib --all-features
+    - run: cargo check --lib -p cc
+    - run: cargo check --lib -p cc --all-features
 
   clippy:
     name: Clippy

diff --git a/Cargo.toml b/Cargo.toml
@@ -28,3 +28,9 @@ parallel = []
 
 [dev-dependencies]
 tempfile = "3"
+
+[workspace]
+members = [
+    "dev-tools/cc-test",
+    "dev-tools/gen-windows-sys-binding",
+]
diff --git a/cc-test/Cargo.toml → dev-tools/cc-test/Cargo.toml b/cc-test/Cargo.toml → dev-tools/cc-test/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 test = false
 
 [build-dependencies]
-cc = { path = ".." }
+cc = { path = "../.." }
 which = "^4.0"
 
 [features]

diff --git a/cc-test/build.rs → dev-tools/cc-test/build.rs b/cc-test/build.rs → dev-tools/cc-test/build.rs
diff --git a/cc-test/src/NMakefile → dev-tools/cc-test/src/NMakefile b/cc-test/src/NMakefile → dev-tools/cc-test/src/NMakefile
diff --git a/cc-test/src/aarch64.S → dev-tools/cc-test/src/aarch64.S b/cc-test/src/aarch64.S → dev-tools/cc-test/src/aarch64.S
diff --git a/cc-test/src/aarch64.asm → dev-tools/cc-test/src/aarch64.asm b/cc-test/src/aarch64.asm → dev-tools/cc-test/src/aarch64.asm
diff --git a/cc-test/src/armv7.S → dev-tools/cc-test/src/armv7.S b/cc-test/src/armv7.S → dev-tools/cc-test/src/armv7.S
diff --git a/cc-test/src/bar1.c → dev-tools/cc-test/src/bar1.c b/cc-test/src/bar1.c → dev-tools/cc-test/src/bar1.c
diff --git a/cc-test/src/bar2.c → dev-tools/cc-test/src/bar2.c b/cc-test/src/bar2.c → dev-tools/cc-test/src/bar2.c
diff --git a/cc-test/src/baz.cpp → dev-tools/cc-test/src/baz.cpp b/cc-test/src/baz.cpp → dev-tools/cc-test/src/baz.cpp
diff --git a/cc-test/src/compile_error.c → dev-tools/cc-test/src/compile_error.c b/cc-test/src/compile_error.c → dev-tools/cc-test/src/compile_error.c
diff --git a/cc-test/src/cuda.cu → dev-tools/cc-test/src/cuda.cu b/cc-test/src/cuda.cu → dev-tools/cc-test/src/cuda.cu
diff --git a/cc-test/src/dummy.c → dev-tools/cc-test/src/dummy.c b/cc-test/src/dummy.c → dev-tools/cc-test/src/dummy.c
diff --git a/cc-test/src/expand.c → dev-tools/cc-test/src/expand.c b/cc-test/src/expand.c → dev-tools/cc-test/src/expand.c
diff --git a/cc-test/src/foo.c → dev-tools/cc-test/src/foo.c b/cc-test/src/foo.c → dev-tools/cc-test/src/foo.c
diff --git a/cc-test/src/i686.S → dev-tools/cc-test/src/i686.S b/cc-test/src/i686.S → dev-tools/cc-test/src/i686.S
diff --git a/cc-test/src/i686.asm → dev-tools/cc-test/src/i686.asm b/cc-test/src/i686.asm → dev-tools/cc-test/src/i686.asm
diff --git a/cc-test/src/include/foo.h → dev-tools/cc-test/src/include/foo.h b/cc-test/src/include/foo.h → dev-tools/cc-test/src/include/foo.h
diff --git a/cc-test/src/lib.rs → dev-tools/cc-test/src/lib.rs b/cc-test/src/lib.rs → dev-tools/cc-test/src/lib.rs
diff --git a/cc-test/src/msvc.c → dev-tools/cc-test/src/msvc.c b/cc-test/src/msvc.c → dev-tools/cc-test/src/msvc.c
diff --git a/cc-test/src/opt_linkage.c → dev-tools/cc-test/src/opt_linkage.c b/cc-test/src/opt_linkage.c → dev-tools/cc-test/src/opt_linkage.c
diff --git a/cc-test/src/riscv64gc.S → dev-tools/cc-test/src/riscv64gc.S b/cc-test/src/riscv64gc.S → dev-tools/cc-test/src/riscv64gc.S
diff --git a/cc-test/src/windows.c → dev-tools/cc-test/src/windows.c b/cc-test/src/windows.c → dev-tools/cc-test/src/windows.c
diff --git a/cc-test/src/x86_64.S → dev-tools/cc-test/src/x86_64.S b/cc-test/src/x86_64.S → dev-tools/cc-test/src/x86_64.S
diff --git a/cc-test/src/x86_64.asm → dev-tools/cc-test/src/x86_64.asm b/cc-test/src/x86_64.asm → dev-tools/cc-test/src/x86_64.asm
diff --git a/cc-test/tests/all.rs → dev-tools/cc-test/tests/all.rs b/cc-test/tests/all.rs → dev-tools/cc-test/tests/all.rs
diff --git a/cc-test/tests/output.rs → dev-tools/cc-test/tests/output.rs b/cc-test/tests/output.rs → dev-tools/cc-test/tests/output.rs
diff --git a/gen-windows-sys-binding/Cargo.toml → dev-tools/gen-windows-sys-binding/Cargo.toml b/gen-windows-sys-binding/Cargo.toml → dev-tools/gen-windows-sys-binding/Cargo.toml
@@ -1,12 +1,8 @@
 [package]
 name = "gen-windows-sys-binding"
 version = "0.0.0"
-edition = "2021"
+edition = "2018"
 publish = false
 
 [dependencies]
 windows-bindgen = "0.49"
-
-# Prevent this from interfering with workspaces
-[workspace]
-members = ["."]
diff --git a/gen-windows-sys-binding/src/main.rs → ...tools/gen-windows-sys-binding/src/main.rs b/gen-windows-sys-binding/src/main.rs → ...tools/gen-windows-sys-binding/src/main.rs
diff --git a/gen-windows-sys-binding/windows_sys.list → .../gen-windows-sys-binding/windows_sys.list b/gen-windows-sys-binding/windows_sys.list → .../gen-windows-sys-binding/windows_sys.list