From d869e16990c5fc2cbda48b036708efa4b450e807 Mon Sep 17 00:00:00 2001 From: David Kellum Date: Tue, 10 Nov 2020 15:01:58 -0800 Subject: [PATCH] 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. --- .github/workflows/ci.yml | 5 ----- tokio/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 975ed5c4df7..07f6d2a1a59 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 62bd672696a..841f7f4edc0 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