summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kellum <dek-oss@gravitext.com>2020-11-10 15:01:58 -0800
committerGitHub <noreply@github.com>2020-11-10 15:01:58 -0800
commitd869e16990c5fc2cbda48b036708efa4b450e807 (patch)
tree2ec5a8ba633a0cbae1464f596ce683fd7da6668b
parente1256d8ca4c510c8417874660e74760d87178445 (diff)
Minor cleanup of parking_lot feature, now in full (#3119)
## Motivation Some small cleanup items are apparent after merge of #2951 ## Solution Delete a now incorrect comment in Cargo.toml, and remove a now redundant CI test step.
-rw-r--r--.github/workflows/ci.yml5
-rw-r--r--tokio/Cargo.toml2
2 files changed, 1 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 975ed5c4..07f6d2a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,11 +53,6 @@ jobs:
run: cargo test --features full
working-directory: tokio
- # Check `tokio` with `full + parking_lot` to make sure it compiles.
- - name: check tokio full,parking_lot
- run: cargo check --features full,parking_lot
- working-directory: tokio
-
# Test **all** crates in the workspace with all features.
- name: test all --all-features
run: cargo test --workspace --all-features
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 62bd6726..841f7f4e 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -100,7 +100,7 @@ lazy_static = { version = "1.0.2", optional = true }
memchr = { version = "2.2", optional = true }
mio = { version = "0.7.5", optional = true }
num_cpus = { version = "1.8.0", optional = true }
-parking_lot = { version = "0.11.0", optional = true } # Not in full
+parking_lot = { version = "0.11.0", optional = true }
slab = { version = "0.4.1", optional = true }
tracing = { version = "0.1.21", default-features = false, features = ["std"], optional = true } # Not in full