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

[Merged by Bors] - Update clap requirement from 3.2 to 4.0 #6303

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/build-wasm-example/Cargo.toml
Expand Up @@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"

[dependencies]
xshell = "0.2"
clap = { version = "3.2", features = ["derive"] }
clap = { version = "4.0", features = ["derive"] }
7 changes: 3 additions & 4 deletions tools/build-wasm-example/src/main.rs
Expand Up @@ -6,18 +6,17 @@ use xshell::{cmd, Shell};
#[derive(Parser, Debug)]
struct Args {
/// Examples to build
#[clap(value_parser)]
examples: Vec<String>,

#[clap(short, long, value_parser)]
#[arg(short, long)]
/// Run tests
test: bool,

#[clap(short, long, value_parser)]
#[arg(short, long)]
/// Run on the given browsers. By default, chromium, firefox, webkit
browsers: Vec<String>,

#[clap(short, long, value_parser)]
#[arg(short, long)]
/// Stop after this number of frames
frames: Option<usize>,
}
Expand Down
2 changes: 1 addition & 1 deletion tools/spancmp/Cargo.toml
Expand Up @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
clap = { version = "3.2", features = ["derive"] }
clap = { version = "4.0", features = ["derive"] }
regex = "1.5"
termcolor = "1.1"
bevy_utils = { path = "../../crates/bevy_utils", version = "0.9.0-dev" }
Expand Down
8 changes: 3 additions & 5 deletions tools/spancmp/src/main.rs
Expand Up @@ -15,22 +15,20 @@ mod pretty;

#[derive(Parser, Debug)]
struct Args {
#[clap(short, long, value_parser, default_value_t = 0.0)]
#[arg(short, long, default_value_t = 0.0)]
/// Filter spans that have an average shorther than the threshold
threshold: f32,

#[clap(short, long, value_parser)]
#[arg(short, long)]
/// Filter spans by name matching the pattern
pattern: Option<Regex>,

#[clap(short, long, value_parser)]
#[arg(short, long)]
/// Simplify system names
short: bool,

#[clap(value_parser)]
trace: String,
/// Optional, second trace to compare
#[clap(value_parser)]
second_trace: Option<String>,
}

Expand Down