tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-08 00:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: enable cargo v2 resolver to prevent dev-deps from enabling log feature of mio (#5787)

Browse Source
This commit is contained in:
Taiki Endo
2023-06-11 17:34:22 +09:00
committed by GitHub
parent 2a54ad01d0
commit c5d52c17ae
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+5 -5
View File
@@ -399,10 +399,10 @@ jobs:
RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64
# https://github.com/tokio-rs/tokio/pull/5356 # https://github.com/tokio-rs/tokio/pull/5356
# https://github.com/tokio-rs/tokio/issues/5373 # https://github.com/tokio-rs/tokio/issues/5373
- run: cargo hack build -p tokio --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going - run: cargo hack build -p tokio --feature-powerset --depth 2 --keep-going
env: env:
RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new
- run: cargo hack build -p tokio --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going - run: cargo hack build -p tokio --feature-powerset --depth 2 --keep-going
env: env:
RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64
@@ -421,15 +421,15 @@ jobs:
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack uses: taiki-e/install-action@cargo-hack
- name: check --feature-powerset - name: check --feature-powerset
run: cargo hack check --all --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going run: cargo hack check --all --feature-powerset --depth 2 --keep-going
# Try with unstable feature flags # Try with unstable feature flags
- name: check --feature-powerset --unstable - name: check --feature-powerset --unstable
run: cargo hack check --all --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going run: cargo hack check --all --feature-powerset --depth 2 --keep-going
env: env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings RUSTFLAGS: --cfg tokio_unstable -Dwarnings
# Try with unstable and taskdump feature flags # Try with unstable and taskdump feature flags
- name: check --feature-powerset --unstable --taskdump - name: check --feature-powerset --unstable --taskdump
run: cargo hack check --all --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going run: cargo hack check --all --feature-powerset --depth 2 --keep-going
env: env:
RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings
Cargo.toml
+1 -1
View File
@@ -1,5 +1,5 @@
[workspace] [workspace]
resolver = "2"
members = [ members = [
"tokio", "tokio",
"tokio-macros", "tokio-macros",
tokio/Cargo.toml
+1 -1
View File
@@ -132,7 +132,7 @@ nix = { version = "0.26", default-features = false, features = ["fs", "socket"]
version = "0.48" version = "0.48"
optional = true optional = true
[target.'cfg(docsrs)'.dependencies.windows-sys] [target.'cfg(windows)'.dev-dependencies.windows-sys]
version = "0.48" version = "0.48"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",