From 2fd49989288a50958c22f3265478b911dd35c803 Mon Sep 17 00:00:00 2001
From: Chad Nehemiah <chad.nehemiah94@gmail.com>
Date: Fri, 10 Jun 2022 11:36:29 -0500
Subject: [PATCH] Cargo.toml: Use Rust 1.60.0 and weak dependency for feats
 (#2646)

---
 CHANGELOG.md |  7 ++++++-
 Cargo.toml   | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc41ea630c0..042cb9f6015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,12 @@
 
 # `libp2p` facade crate
 
+# 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].
+
+[PR 2646]: https://github.com/libp2p/rust-libp2p/pull/2646
+
 # 0.45.1
 
 - Update individual crates.
@@ -53,7 +59,6 @@
     - Update to [`libp2p-swarm` `v0.36.1`](swarm/CHANGELOG.md).
 
 # 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 9115ab4a817..a48316a6479 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "libp2p"
 edition = "2021"
-rust-version = "1.56.1"
+rust-version = "1.60.0"
 description = "Peer-to-peer networking library"
-version = "0.45.1"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -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