Merge branch 'master' of github.com:libp2p/rust-libp2p into libp2p-quic

Author: elenaf9

Cargo.toml

@@ -143,7 +143,7 @@ libp2p-gossipsub = { version = "0.42.1", path = "protocols/gossipsub", optional
 async-std = { version = "1.6.2", features = ["attributes"] }
 async-trait = "0.1"
 env_logger = "0.9.0"
-clap = { version = "3.1.6", features = ["derive"] }
+clap = { version = "4.0.13", features = ["derive"] }
 tokio = { version = "1.15", features = ["io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
 
 [workspace]

README.md

@@ -85,6 +85,7 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
 - [COMIT](https://github.com/comit-network/xmr-btc-swap) - Bitcoin–Monero Cross-chain Atomic Swap.
 - [Forest](https://github.com/ChainSafe/forest) - An implementation of Filecoin written in Rust.
+- [fuel-core](https://github.com/FuelLabs/fuel-core) - A Rust implementation of the Fuel protocol.
 - [ipfs-embed](https://github.com/ipfs-rust/ipfs-embed) - A small embeddable ipfs implementation
 used and maintained by [Actyx][https://www.actyx.com].
 - [iroh](https://github.com/n0-computer/iroh) - Next-generation implementation of IPFS for Cloud & Mobile platforms.

misc/keygen/Cargo.toml

@@ -10,7 +10,7 @@ categories = ["network-programming", "asynchronous"]
 publish = false
 
 [dependencies]
-clap = {version = "3.1.6", features = ["derive"]}
+clap = { version = "4.0.13", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"

misc/keygen/src/main.rs

@@ -27,7 +27,7 @@ enum Command {
     /// Read from config file
     From {
         /// Provide a IPFS config file
-        #[clap(parse(from_os_str))]
+        #[clap(value_parser)]
         config: PathBuf,
     },
     /// Generate random

protocols/autonat/Cargo.toml

@@ -28,5 +28,5 @@ prost = "0.11"
 [dev-dependencies]
 async-std = { version = "1.10", features = ["attributes"] }
 env_logger = "0.9"
-clap = {version = "3.1.6", features = ["derive"]}
+clap = { version = "4.0.13", features = ["derive"] }
 libp2p = { path = "../..", features = ["full"] }

protocols/dcutr/Cargo.toml

@@ -32,4 +32,4 @@ prost-build = "0.11"
 env_logger = "0.9.0"
 libp2p = { path = "../..", features = ["full"] }
 rand = "0.8"
-clap = {version = "3.1.6", features = ["derive"]}
+clap = { version = "4.0.13", features = ["derive"] }

protocols/dcutr/examples/dcutr.rs

@@ -60,7 +60,7 @@ struct Opts {
     remote_peer_id: Option<PeerId>,
 }
 
-#[derive(Debug, Parser, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Parser)]
 enum Mode {
     Dial,
     Listen,

protocols/relay/Cargo.toml

@@ -36,4 +36,4 @@ prost-build = "0.11"
 env_logger = "0.9.0"
 libp2p = { path = "../..", features = ["full"] }
 quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
-clap = {version = "3.1.6", features = ["derive"]}
+clap = { version = "4.0.13", features = ["derive"] }