Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump clap from 3.1.8 to 3.1.10 (backport #211) #218

Open
wants to merge 1 commit into
base: v1.9
Choose a base branch
from
Open

chore: bump clap from 3.1.8 to 3.1.10 (backport #211) #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions accounts-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
=======
clap = "3.1.8"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
log = "0.4.14"
rayon = "1.5.1"
solana-logger = { path = "../logger", version = "=1.9.17" }
Expand Down
2 changes: 1 addition & 1 deletion accounts-cluster-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
publish = false

[dependencies]
clap = "3.1.8"
clap = "3.1.10"
log = "0.4.14"
<<<<<<< HEAD
rand = "0.7.0"
Expand Down
4 changes: 4 additions & 0 deletions banking-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ homepage = "https://solana.com/"
publish = false

[dependencies]
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = { version = "3.1.10", features = ["derive"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
crossbeam-channel = "0.5"
log = "0.4.14"
<<<<<<< HEAD
Expand Down
2 changes: 1 addition & 1 deletion bench-streamer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ solana-net-utils = { path = "../net-utils", version = "=1.9.17" }
solana-version = { path = "../version", version = "=1.9.17" }
=======
crossbeam-channel = "0.5"
clap = { version = "3.1.8", features = ["cargo"] }
clap = { version = "3.1.10", features = ["cargo"] }
solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
solana-streamer = { path = "../streamer", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" }
Expand Down
4 changes: 4 additions & 0 deletions bench-tps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = "3.1.8"
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
crossbeam-channel = "0.5"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
log = "0.4.14"
Expand Down
2 changes: 1 addition & 1 deletion clap-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.17" }
solana-sdk = { path = "../sdk", version = "=1.9.17" }
=======
chrono = "0.4"
clap = "3.1.8"
clap = "3.1.10"
rpassword = "6.0"
solana-perf = { path = "../perf", version = "=1.11.0" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion clap-v3-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"

[dependencies]
chrono = "0.4"
clap = { version = "3.1.8", features = ["cargo"] }
clap = { version = "3.1.10", features = ["cargo"] }
rpassword = "6.0"
solana-perf = { path = "../perf", version = "=1.11.0" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cli-output/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-cli-output"
[dependencies]
base64 = "0.13.0"
chrono = { version = "0.4.11", features = ["serde"] }
clap = "3.1.8"
clap = "3.1.10"
console = "0.15.0"
humantime = "2.0.1"
Inflector = "0.11.4"
Expand Down
4 changes: 4 additions & 0 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ documentation = "https://docs.rs/solana-cli"
bincode = "1.3.3"
bs58 = "0.4.0"
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
criterion-stats = "0.3.0"
ctrlc = { version = "3.2.1", features = ["termination"] }
=======
clap = "3.1.8"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
console = "0.15.0"
const_format = "0.2.22"
log = "0.4.14"
Expand Down
2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bs58 = "0.4.0"
clap = "2.33.0"
=======
bytes = "1.1.0"
clap = "3.1.8"
clap = "3.1.10"
crossbeam-channel = "0.5"
futures = "0.3"
futures-util = "0.3.21"
Expand Down
4 changes: 4 additions & 0 deletions dos/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ publish = false
[dependencies]
bincode = "1.3.3"
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = {version = "3.1.8", features = ["derive", "cargo"]}
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = {version = "3.1.10", features = ["derive", "cargo"]}
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
log = "0.4.14"
<<<<<<< HEAD
rand = "0.7.0"
Expand Down
2 changes: 1 addition & 1 deletion genesis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.9.17" }
tempfile = "3.2.0"
=======
base64 = "0.13.0"
clap = "3.1.8"
clap = "3.1.10"
serde = "1.0.136"
serde_json = "1.0.79"
serde_yaml = "0.8.23"
Expand Down
4 changes: 4 additions & 0 deletions gossip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ documentation = "https://docs.rs/solana-gossip"
bincode = "1.3.3"
bv = { version = "0.11.1", features = ["serde"] }
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = "3.1.8"
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
crossbeam-channel = "0.5"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
flate2 = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion install/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ atty = "0.2.11"
bincode = "1.3.3"
bzip2 = "0.4.3"
chrono = { version = "0.4.11", features = ["serde"] }
clap = { version = "3.1.8" }
clap = { version = "3.1.10" }
console = "0.15.0"
ctrlc = { version = "3.2.1", features = ["termination"] }
dirs-next = "2.0.0"
Expand Down
4 changes: 4 additions & 0 deletions ledger-tool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ documentation = "https://docs.rs/solana-ledger-tool"
[dependencies]
bs58 = "0.4.0"
<<<<<<< HEAD
<<<<<<< HEAD
bytecount = "0.6.2"
clap = "2.33.1"
=======
clap = "3.1.8"
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
crossbeam-channel = "0.5"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
csv = "1.1.6"
Expand Down
2 changes: 1 addition & 1 deletion log-analyzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ solana-logger = { path = "../logger", version = "=1.9.17" }
solana-version = { path = "../version", version = "=1.9.17" }
=======
byte-unit = "4.0.14"
clap = { version = "3.1.8", features = ["cargo"] }
clap = { version = "3.1.10", features = ["cargo"] }
serde = "1.0.136"
serde_json = "1.0.79"
solana-logger = { path = "../logger", version = "=1.11.0" }
Expand Down
4 changes: 4 additions & 0 deletions merkle-root-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
=======
clap = "3.1.8"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
log = "0.4.14"
solana-logger = { path = "../logger", version = "=1.9.17" }
solana-runtime = { path = "../runtime", version = "=1.9.17" }
Expand Down
4 changes: 4 additions & 0 deletions net-shaper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ rand = "0.7.0"
=======
=======
rand = "0.8.5"
<<<<<<< HEAD
>>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205))
clap = { version = "3.1.8", features = ["cargo"] }
=======
clap = { version = "3.1.10", features = ["cargo"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
solana-logger = { path = "../logger", version = "=1.11.0" }
Expand Down
4 changes: 4 additions & 0 deletions net-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ edition = "2021"
[dependencies]
bincode = "1.3.3"
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = { version = "3.1.8", features = ["cargo"] }
=======
clap = { version = "3.1.10", features = ["cargo"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
crossbeam-channel = "0.5"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
log = "0.4.14"
Expand Down
4 changes: 4 additions & 0 deletions poh-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = { version = "3.1.8", features = ["cargo"] }
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = { version = "3.1.10", features = ["cargo"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
log = "0.4.14"
<<<<<<< HEAD
rand = "0.7.0"
Expand Down
4 changes: 4 additions & 0 deletions rbpf-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
clap = "3.0.0-beta.2"
serde = "1.0.130"
serde_json = "1.0.72"
Expand All @@ -22,6 +23,9 @@ solana_rbpf = "=0.2.24"
time = "0.3.5"
=======
clap = { version = "3.1.8", features = ["cargo"] }
=======
clap = { version = "3.1.10", features = ["cargo"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
serde = "1.0.136"
serde_json = "1.0.79"
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" }
Expand Down
4 changes: 4 additions & 0 deletions runtime/store-tool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ publish = false

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
=======
clap = "3.1.8"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
log = { version = "0.4.14" }
solana-logger = { path = "../../logger", version = "=1.9.17" }
solana-version = { path = "../../version", version = "=1.9.17" }
Expand Down
4 changes: 4 additions & 0 deletions sdk/cargo-build-bpf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ bzip2 = "0.4.3"
clap = "2.33.3"
=======
cargo_metadata = "0.14.2"
<<<<<<< HEAD
clap = { version = "3.1.8", features = ["cargo", "env"] }
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = { version = "3.1.10", features = ["cargo", "env"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
regex = "1.5.4"
cargo_metadata = "0.14.1"
solana-sdk = { path = "..", version = "=1.9.17" }
Expand Down
4 changes: 4 additions & 0 deletions sdk/cargo-test-bpf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ clap = "2.33.3"
cargo_metadata = "0.14.1"
=======
cargo_metadata = "0.14.2"
<<<<<<< HEAD
clap = { version = "3.1.8", features = ["cargo"] }
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
=======
clap = { version = "3.1.10", features = ["cargo"] }
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))

[[bin]]
name = "cargo-test-bpf"
Expand Down
4 changes: 4 additions & 0 deletions stake-accounts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ documentation = "https://docs.rs/solana-stake-accounts"

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
solana-clap-utils = { path = "../clap-utils", version = "=1.9.17" }
solana-cli-config = { path = "../cli-config", version = "=1.9.17" }
Expand All @@ -20,6 +21,9 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" }
solana-stake-program = { path = "../programs/stake", version = "=1.9.17" }
=======
clap = "3.1.8"
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
solana-client = { path = "../client", version = "=1.11.0" }
Expand Down
4 changes: 4 additions & 0 deletions sys-tuner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ publish = true

[dependencies]
<<<<<<< HEAD
<<<<<<< HEAD
clap = "2.33.1"
=======
clap = "3.1.8"
=======
clap = "3.1.10"
>>>>>>> e39c48ccd (chore: bump clap from 3.1.8 to 3.1.10 (#211))
libc = "0.2.120"
>>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
log = "0.4.14"
Expand Down
Loading