From 3b839476d910c1d55c698834acfc00e819f70566 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 08:31:24 +0000
Subject: [PATCH] Bump clap from 3.0.7 to 3.1.1 (#1035)
* Bump clap from 3.0.7 to 3.1.1
Bumps [clap](https://github.com/clap-rs/clap) from 3.0.7 to 3.1.1.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v3.0.7...v3.1.1)
---
updated-dependencies:
- dependency-name: clap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix up deprecated usages
* cargo fmt
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
---
cumulus/Cargo.lock | 24 +++++++++++-----------
cumulus/client/cli/Cargo.toml | 2 +-
cumulus/parachain-template/node/Cargo.toml | 2 +-
cumulus/parachain-template/node/src/cli.rs | 12 +++++------
cumulus/polkadot-parachains/Cargo.toml | 2 +-
cumulus/polkadot-parachains/src/cli.rs | 12 +++++------
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 67142405502..a8406d0176f 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -1146,9 +1146,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.0.7"
+version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3"
+checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
dependencies = [
"atty",
"bitflags",
@@ -1163,9 +1163,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "3.0.6"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153"
+checksum = "5fd1122e63869df2cb309f449da1ad54a7c6dfeb7c7e6ccd8e0825d9eb93bb72"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
@@ -1528,7 +1528,7 @@ dependencies = [
name = "cumulus-client-cli"
version = "0.1.0"
dependencies = [
- "clap 3.0.7",
+ "clap 3.1.1",
"sc-cli",
"sc-service",
]
@@ -2639,7 +2639,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058
dependencies = [
"Inflector",
"chrono",
- "clap 3.0.7",
+ "clap 3.1.1",
"frame-benchmarking",
"frame-support",
"handlebars",
@@ -6332,7 +6332,7 @@ dependencies = [
name = "parachain-template-node"
version = "0.1.0"
dependencies = [
- "clap 3.0.7",
+ "clap 3.1.1",
"cumulus-client-cli",
"cumulus-client-collator",
"cumulus-client-consensus-aura",
@@ -6946,7 +6946,7 @@ name = "polkadot-cli"
version = "0.9.17"
source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
dependencies = [
- "clap 3.0.7",
+ "clap 3.1.1",
"frame-benchmarking-cli",
"futures 0.3.21",
"log",
@@ -7001,7 +7001,7 @@ dependencies = [
"assert_cmd",
"async-trait",
"canvas-kusama-runtime",
- "clap 3.0.7",
+ "clap 3.1.1",
"cumulus-client-cli",
"cumulus-client-consensus-aura",
"cumulus-client-consensus-common",
@@ -9184,7 +9184,7 @@ version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
dependencies = [
"chrono",
- "clap 3.0.7",
+ "clap 3.1.1",
"fdlimit",
"futures 0.3.21",
"hex",
@@ -11972,7 +11972,7 @@ dependencies = [
"chrono",
"lazy_static",
"matchers",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.2",
"regex",
"serde",
"serde_json",
@@ -12061,7 +12061,7 @@ name = "try-runtime-cli"
version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
dependencies = [
- "clap 3.0.7",
+ "clap 3.1.1",
"jsonrpsee 0.4.1",
"log",
"parity-scale-codec",
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index 705460188ca..4166eaa4fd2 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
[dependencies]
-clap = { version = "3.0", features = ["derive"] }
+clap = { version = "3.1", features = ["derive"] }
# Substrate dependencies
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index 92be7b4def5..a31ed1ea4ea 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -27,7 +27,7 @@ runtime-benchmarks = [
try-runtime = ["parachain-template-runtime/try-runtime"]
[dependencies]
-clap = { version = "3.0", features = ["derive"] }
+clap = { version = "3.1", features = ["derive"] }
derive_more = "0.99.2"
log = "0.4.14"
codec = { package = "parity-scale-codec", version = "2.0.0" }
diff --git a/cumulus/parachain-template/node/src/cli.rs b/cumulus/parachain-template/node/src/cli.rs
index a7e8934b78c..b7cc61344eb 100644
--- a/cumulus/parachain-template/node/src/cli.rs
+++ b/cumulus/parachain-template/node/src/cli.rs
@@ -1,5 +1,5 @@
use crate::chain_spec;
-use clap::{AppSettings, Parser};
+use clap::Parser;
use std::path::PathBuf;
/// Sub-commands supported by the collator.
@@ -75,11 +75,11 @@ pub struct ExportGenesisWasmCommand {
}
#[derive(Debug, Parser)]
-#[clap(setting(
- AppSettings::PropagateVersion |
- AppSettings::ArgsNegateSubcommands |
- AppSettings::SubcommandsNegateReqs,
-))]
+#[clap(
+ propagate_version = true,
+ args_conflicts_with_subcommands = true,
+ subcommand_negates_reqs = true
+)]
pub struct Cli {
#[clap(subcommand)]
pub subcommand: Option<Subcommand>,
diff --git a/cumulus/polkadot-parachains/Cargo.toml b/cumulus/polkadot-parachains/Cargo.toml
index 3c6b9261aa2..33ccfc8351d 100644
--- a/cumulus/polkadot-parachains/Cargo.toml
+++ b/cumulus/polkadot-parachains/Cargo.toml
@@ -10,7 +10,7 @@ name = "polkadot-collator"
path = "src/main.rs"
[dependencies]
-clap = { version = "3.0", features = ["derive"] }
+clap = { version = "3.1", features = ["derive"] }
futures = { version = "0.3.1", features = ["compat"] }
log = "0.4.8"
codec = { package = "parity-scale-codec", version = "2.3.0" }
diff --git a/cumulus/polkadot-parachains/src/cli.rs b/cumulus/polkadot-parachains/src/cli.rs
index c7037de0272..2226111ac41 100644
--- a/cumulus/polkadot-parachains/src/cli.rs
+++ b/cumulus/polkadot-parachains/src/cli.rs
@@ -15,7 +15,7 @@
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use crate::chain_spec;
-use clap::{AppSettings, Parser};
+use clap::Parser;
use sc_cli;
use std::path::PathBuf;
@@ -96,11 +96,11 @@ pub struct ExportGenesisWasmCommand {
}
#[derive(Debug, Parser)]
-#[clap(setting(
- AppSettings::PropagateVersion |
- AppSettings::ArgsNegateSubcommands |
- AppSettings::SubcommandsNegateReqs
-))]
+#[clap(
+ propagate_version = true,
+ args_conflicts_with_subcommands = true,
+ subcommand_negates_reqs = true
+)]
pub struct Cli {
#[clap(subcommand)]
pub subcommand: Option<Subcommand>,
--
GitLab