From 680796888187d211df099cc4479f32b40bea3834 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 16 May 2022 21:06:09 -0500 Subject: [PATCH 1/2] core/use weak dependencies + Rust 1.60.0 (#2286) --- CHANGELOG.md | 7 ++++++- Cargo.toml | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27eb2bf1bba..111b941714a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,8 +43,13 @@ # `libp2p` facade crate -# 0.45.0 +# 0.45.1 +- Semver bump Rust from `1.56.1` to `1.60.0` . See [PR 2646]. +- Added weak dependencies for features. See [PR 2646]. + +[PR 2646]: https://github.com/libp2p/rust-libp2p/pull/2646 +# 0.45.0 - Update individual crates. - Update to [`libp2p-plaintext` `v0.33.0`](transports/plaintext/CHANGELOG.md). - Update to [`libp2p-noise` `v0.36.0`](transports/noise/CHANGELOG.md). diff --git a/Cargo.toml b/Cargo.toml index 9f3fe5f495e..0aaaab45300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libp2p" edition = "2021" -rust-version = "1.56.1" +rust-version = "1.60.0" description = "Peer-to-peer networking library" version = "0.45.0" authors = ["Parity Technologies "] @@ -35,35 +35,35 @@ default = [ "websocket", "yamux", ] -autonat = ["libp2p-autonat"] -dcutr = ["libp2p-dcutr", "libp2p-metrics/dcutr"] -deflate = ["libp2p-deflate"] -dns-async-std = ["libp2p-dns", "libp2p-dns/async-std"] -dns-tokio = ["libp2p-dns", "libp2p-dns/tokio"] -floodsub = ["libp2p-floodsub"] -identify = ["libp2p-identify", "libp2p-metrics/identify"] -kad = ["libp2p-kad", "libp2p-metrics/kad"] -gossipsub = ["libp2p-gossipsub", "libp2p-metrics/gossipsub"] -metrics = ["libp2p-metrics"] -mdns = ["libp2p-mdns"] -mplex = ["libp2p-mplex"] -noise = ["libp2p-noise"] -ping = ["libp2p-ping", "libp2p-metrics/ping"] -plaintext = ["libp2p-plaintext"] -pnet = ["libp2p-pnet"] -relay = ["libp2p-relay", "libp2p-metrics/relay"] -request-response = ["libp2p-request-response"] -rendezvous = ["libp2p-rendezvous"] -tcp-async-io = ["libp2p-tcp", "libp2p-tcp/async-io"] -tcp-tokio = ["libp2p-tcp", "libp2p-tcp/tokio"] -uds = ["libp2p-uds"] +autonat = ["dep:libp2p-autonat"] +dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"] +deflate = ["dep:libp2p-deflate"] +dns-async-std = ["dep:libp2p-dns", "libp2p-dns?/async-std"] +dns-tokio = ["dep:libp2p-dns", "libp2p-dns?/tokio"] +floodsub = ["dep:libp2p-floodsub"] +identify = ["dep:libp2p-identify", "libp2p-metrics?/identify"] +kad = ["dep:libp2p-kad", "libp2p-metrics?/kad"] +gossipsub = ["dep:libp2p-gossipsub", "libp2p-metrics?/gossipsub"] +metrics = ["dep:libp2p-metrics"] +mdns = ["dep:libp2p-mdns"] +mplex = ["dep:libp2p-mplex"] +noise = ["dep:libp2p-noise"] +ping = ["dep:libp2p-ping", "libp2p-metrics?/ping"] +plaintext = ["dep:libp2p-plaintext"] +pnet = ["dep:libp2p-pnet"] +relay = ["dep:libp2p-relay", "libp2p-metrics?/relay"] +request-response = ["dep:libp2p-request-response"] +rendezvous = ["dep:libp2p-rendezvous"] +tcp-async-io = ["dep:libp2p-tcp", "libp2p-tcp?/async-io"] +tcp-tokio = ["dep:libp2p-tcp", "libp2p-tcp?/tokio"] +uds = ["dep:libp2p-uds"] 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"] -yamux = ["libp2p-yamux"] +wasm-ext = ["dep:libp2p-wasm-ext"] +wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext?/websocket"] +websocket = ["dep:libp2p-websocket"] +yamux = ["dep:libp2p-yamux"] secp256k1 = ["libp2p-core/secp256k1"] -serde = ["libp2p-core/serde", "libp2p-kad/serde", "libp2p-gossipsub/serde"] +serde = ["libp2p-core/serde", "libp2p-kad?/serde", "libp2p-gossipsub?/serde"] [package.metadata.docs.rs] all-features = true From ba7e327721019399bf49410a47f3f491cf6dc3ac Mon Sep 17 00:00:00 2001 From: chad Date: Sun, 29 May 2022 19:58:14 -0500 Subject: [PATCH 2/2] core/upgrade Changelog and Cargo.toml for Rust MSRV 1.60.0 --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 111b941714a..0f6dfb310c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,7 +43,7 @@ # `libp2p` facade crate -# 0.45.1 +# 0.46.0 [unreleased] - Semver bump Rust from `1.56.1` to `1.60.0` . See [PR 2646]. - Added weak dependencies for features. See [PR 2646]. diff --git a/Cargo.toml b/Cargo.toml index 0aaaab45300..217f0ebabe8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p" edition = "2021" rust-version = "1.60.0" description = "Peer-to-peer networking library" -version = "0.45.0" +version = "0.46.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p"