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.

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

Upgrade clap to stable version #222

Merged
merged 2 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ctl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repository = "https://github.com/tikv/raft-engine"
license = "Apache-2.0"

[dependencies]
clap = { version = "3.0.0-rc.0", features = ["derive", "cargo"] }
clap = { version = "3.1", features = ["derive", "cargo"] }
env_logger = "0.9"
raft-engine = { path = "..", version = "0.2.0", features = ["scripting", "internals"] }
6 changes: 3 additions & 3 deletions ctl/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use std::path::Path;

use clap::{crate_authors, crate_version, AppSettings, Parser};
use clap::{crate_authors, crate_version, Parser};
use raft_engine::internals::LogQueue;
use raft_engine::{Engine, Error, Result as EngineResult};

Expand All @@ -24,7 +24,7 @@ use raft_engine::{Engine, Error, Result as EngineResult};
name = "ctl",
author = crate_authors!(),
version = crate_version!(),
setting = AppSettings::DontCollapseArgsInUsage,
dont_collapse_args_in_usage = true,
)]
pub struct ControlOpt {
// sub command type
Expand All @@ -40,7 +40,7 @@ enum Cmd {
#[clap(short, long)]
path: String,

#[clap(short, long, use_delimiter = true)]
#[clap(short, long, use_value_delimiter = true)]
raft_groups: Vec<u64>,
},

Expand Down
2 changes: 1 addition & 1 deletion stress/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["The TiKV Authors"]
edition = "2018"

[dependencies]
clap = { version = "3.0.0-rc.0", features = ["derive", "cargo"] }
clap = { version = "3.1", features = ["derive", "cargo"] }
const_format = "0.2.13"
hdrhistogram = "7.4"
parking_lot_core = "0.9"
Expand Down
4 changes: 2 additions & 2 deletions stress/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::sync::Arc;
use std::thread::{sleep, Builder as ThreadBuilder, JoinHandle};
use std::time::{Duration, Instant};

use clap::{crate_authors, crate_version, AppSettings, Parser};
use clap::{crate_authors, crate_version, Parser};

use const_format::formatcp;
use hdrhistogram::Histogram;
Expand Down Expand Up @@ -52,7 +52,7 @@ const DEFAULT_WRITE_SYNC: bool = false;
about = "A stress test tool for Raft Engine",
author = crate_authors!(),
version = crate_version!(),
setting = AppSettings::DontCollapseArgsInUsage,
dont_collapse_args_in_usage = true,
)]
struct ControlOpt {
/// Path of raft-engine storage directory
Expand Down