Bump clap to version 4 #679
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 10, 2023
sunshowers
approved these changes
May 15, 2023
src/lib.rs
Outdated
Comment on lines
930
to
946
| if let Some(color) = matches.get_one("color").map(String::as_str) { | ||
| if color != "auto" { | ||
| eprintln!("Warning: --color will be ignored when running with cargo-criterion. Use `cargo criterion --color {} -- <args>` instead.", color); | ||
| } | ||
| } | ||
| if matches.is_present("verbose") { | ||
| if matches.get_flag("verbose") { | ||
| eprintln!("Warning: --verbose will be ignored when running with cargo-criterion. Use `cargo criterion --output-format verbose -- <args>` instead."); | ||
| } | ||
| if matches.is_present("noplot") { | ||
| if matches.get_flag("noplot") { | ||
| eprintln!("Warning: --noplot will be ignored when running with cargo-criterion. Use `cargo criterion --plotting-backend disabled -- <args>` instead."); | ||
| } | ||
| if let Some(backend) = matches.value_of("plotting-backend") { | ||
| if let Some(backend) = matches.get_one::<String>("plotting-backend") { | ||
| eprintln!("Warning: --plotting-backend will be ignored when running with cargo-criterion. Use `cargo criterion --plotting-backend {} -- <args>` instead.", backend); | ||
| } | ||
| if let Some(format) = matches.value_of("output-format") { | ||
| if let Some(format) = matches.get_one::<String>("output-format") { | ||
| if format != "criterion" { | ||
| eprintln!("Warning: --output-format will be ignored when running with cargo-criterion. Use `cargo criterion --output-format {} -- <args>` instead.", format); |
There was a problem hiding this comment.
Hmm, is there a reason for the different ways in which get_one is called here?
There was a problem hiding this comment.
When used in an if statement where the type needs to be comparable to a &str, it ought to be
if let Some(…) = matches.get_one::<String>("…") {When used in an if statement where the type needs to be exactly a &str, it ought to be
match matches.get_one("…").map(String::as_str) {I've fixed one case on line 930. Thanks for catching that style nit!
sjackman
commented
May 15, 2023
src/lib.rs
Outdated
| @@ -920,50 +927,51 @@ https://bheisler.github.io/criterion.rs/book/faq.html | |||
| .get_matches(); | |||
|
|
|||
| if self.connection.is_some() { | |||
| if let Some(color) = matches.value_of("color") { | |||
| if let Some(color) = matches.get_one("color").map(String::as_str) { | |||
There was a problem hiding this comment.
@sunshowers This line was the odd one out.
I've changed
if let Some(color) = matches.get_one("color").map(String::as_str) {to
if let Some(color) = matches.get_one::<String>("color") {
nbarrios1337
added a commit
to nbarrios1337/criterion.rs
that referenced
this pull request
May 17, 2023
|
Thank you for merging! |
|
I see that the last stable release was version 0.4.0 on 2022-09-10. No rush, but might there be a stable release on the horizon that includes this change? |
|
@lemmih Thank you for the releases, David! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bump
clapto version 4.Bump MSRV to 1.64 for
clap.value_parserfor numeric value typespossible_valuestovalue_parserhidden(true)tohide(true)value_ofandvalue_of_t_or_exittoget_oneis_presenttoget_flagorcontains_idtakes_value(true), sincenum_args(1)is the defaultnum_args(0)where neededSee https://github.com/clap-rs/clap/releases/tag/v3.2.0