From 5b626e229e623d2a1fe3923a408087f29b8cc185 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 16:40:31 +0000 Subject: [PATCH 1/3] build(deps): Update parking_lot requirement from 0.11.0 to 0.12.0 Updates the requirements on [parking_lot](https://github.com/Amanieu/parking_lot) to permit the latest version. - [Release notes](https://github.com/Amanieu/parking_lot/releases) - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](https://github.com/Amanieu/parking_lot/compare/0.11.0...0.12.0) --- updated-dependencies: - dependency-name: parking_lot dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- core/Cargo.toml | 2 +- muxers/mplex/Cargo.toml | 2 +- muxers/yamux/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 16c4585fc74..a635447bc3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,7 +97,7 @@ libp2p-uds = { version = "0.32.0", path = "transports/uds", optional = true } libp2p-wasm-ext = { version = "0.32.0", path = "transports/wasm-ext", default-features = false, optional = true } libp2p-yamux = { version = "0.36.0", path = "muxers/yamux", optional = true } multiaddr = { version = "0.14.0" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" pin-project = "1.0.0" rand = "0.7.3" # Explicit dependency to be used in `wasm-bindgen` feature smallvec = "1.6.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 0d5c95ea709..98486e7e35f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -26,7 +26,7 @@ multiaddr = { version = "0.14.0" } multihash = { version = "0.16", default-features = false, features = ["std", "multihash-impl", "identity", "sha2"] } multistream-select = { version = "0.11", path = "../misc/multistream-select" } p256 = { version = "0.10.0", default-features = false, features = ["ecdsa"], optional = true } -parking_lot = "0.11.0" +parking_lot = "0.12.0" pin-project = "1.0.0" prost = "0.9" rand = "0.8" diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index a42a7e2c158..85950b4c3a1 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -17,7 +17,7 @@ asynchronous-codec = "0.6" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } log = "0.4" nohash-hasher = "0.2" -parking_lot = "0.11" +parking_lot = "0.12" rand = "0.7" smallvec = "1.6.1" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml index 70332636cc2..c2ce4244be5 100644 --- a/muxers/yamux/Cargo.toml +++ b/muxers/yamux/Cargo.toml @@ -13,6 +13,6 @@ categories = ["network-programming", "asynchronous"] [dependencies] futures = "0.3.1" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -parking_lot = "0.11" +parking_lot = "0.12" thiserror = "1.0" yamux = "0.10.0" From 6568a324f005f95063cba62fca41bcf0144ef4bb Mon Sep 17 00:00:00 2001 From: Max Inden Date: Fri, 4 Feb 2022 16:48:10 +0100 Subject: [PATCH 2/3] */CHANGELOG: Add entries --- CHANGELOG.md | 4 ++++ core/CHANGELOG.md | 4 ++++ muxers/mplex/CHANGELOG.md | 4 ++++ muxers/yamux/CHANGELOG.md | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba69525d735..c55526a7013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,10 @@ - Update to `libp2p-websocket` `v0.34.0`. - Update to `libp2p-yamux` `v0.36.0`. +- Update to `parking_lot` `v0.12.0`. See [PR 2463]. + +[PR 2463]: https://github.com/libp2p/rust-libp2p/pull/2463/ + ## Version 0.42.1 [2022-02-02] - Update individual crates. diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 61900cf321b..f03d2a45e12 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -6,6 +6,10 @@ - Implement `Display` on `DialError`. See [PR 2456]. +- Update to `parking_lot` `v0.12.0`. See [PR 2463]. + +[PR 2463]: https://github.com/libp2p/rust-libp2p/pull/2463/ + [PR 2456]: https://github.com/libp2p/rust-libp2p/pull/2456 # 0.31.0 [2022-01-27] diff --git a/muxers/mplex/CHANGELOG.md b/muxers/mplex/CHANGELOG.md index ea8797ced79..54b0e3d2037 100644 --- a/muxers/mplex/CHANGELOG.md +++ b/muxers/mplex/CHANGELOG.md @@ -2,6 +2,10 @@ - Update to `libp2p-core` `v0.32.0`. +- Update to `parking_lot` `v0.12.0`. See [PR 2463]. + +[PR 2463]: https://github.com/libp2p/rust-libp2p/pull/2463/ + # 0.31.0 [2022-01-27] - Update dependencies. diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md index 1092415955d..7932db1c818 100644 --- a/muxers/yamux/CHANGELOG.md +++ b/muxers/yamux/CHANGELOG.md @@ -2,6 +2,10 @@ - Update to `libp2p-core` `v0.32.0`. +- Update to `parking_lot` `v0.12.0`. See [PR 2463]. + +[PR 2463]: https://github.com/libp2p/rust-libp2p/pull/2463/ + # 0.35.0 [2022-01-27] - Update dependencies. From 02b710aaa4768d6b31c836b20403d6f9b418bda8 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Wed, 16 Feb 2022 14:56:36 +0100 Subject: [PATCH 3/3] Cargo.toml: Remove parking_log/wasm-bindgen feature --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a635447bc3c..42d98227476 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ rendezvous = ["libp2p-rendezvous"] tcp-async-io = ["libp2p-tcp", "libp2p-tcp/async-io"] tcp-tokio = ["libp2p-tcp", "libp2p-tcp/tokio"] uds = ["libp2p-uds"] -wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "parking_lot/wasm-bindgen", "getrandom/js", "rand/wasm-bindgen"] +wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "rand/wasm-bindgen"] wasm-ext = ["libp2p-wasm-ext"] wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext/websocket"] websocket = ["libp2p-websocket"]