From b00d48d9912fcb08ae199564953a45d6a79e5645 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Mon, 31 Jan 2022 21:59:42 +0000 Subject: [PATCH 1/2] chore: Update parking_lot to v0.12 Bumps `parking_lot` from 0.11.0 to 0.12.0. --- tokio/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 38a9a6d4667..67a28478c15 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -100,12 +100,14 @@ once_cell = { version = "1.5.2", optional = true } memchr = { version = "2.2", optional = true } mio = { version = "0.7.6", optional = true } num_cpus = { version = "1.8.0", optional = true } -parking_lot = { version = "0.11.0", optional = true } +parking_lot = { version = "0.12.0", optional = true } # Currently unstable. The API exposed by these features may be broken at any time. # Requires `--cfg tokio_unstable` to enable. [target.'cfg(tokio_unstable)'.dependencies] -tracing = { version = "0.1.25", default-features = false, features = ["std"], optional = true } # Not in full +tracing = { version = "0.1.25", default-features = false, features = [ + "std", +], optional = true } # Not in full [target.'cfg(unix)'.dependencies] libc = { version = "0.2.42", optional = true } From 755e05b5cb5ecd1395e779738d0bcf8795774a7a Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Mon, 31 Jan 2022 14:03:25 -0800 Subject: [PATCH 2/2] Revert unintended change to tokio/Cargo.toml --- tokio/Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 67a28478c15..bd34bb56b0c 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -105,9 +105,7 @@ parking_lot = { version = "0.12.0", optional = true } # Currently unstable. The API exposed by these features may be broken at any time. # Requires `--cfg tokio_unstable` to enable. [target.'cfg(tokio_unstable)'.dependencies] -tracing = { version = "0.1.25", default-features = false, features = [ - "std", -], optional = true } # Not in full +tracing = { version = "0.1.25", default-features = false, features = ["std"], optional = true } # Not in full [target.'cfg(unix)'.dependencies] libc = { version = "0.2.42", optional = true }