From 9c8492de40903bcc56142b6c7069130be3ab7bc2 Mon Sep 17 00:00:00 2001 From: frobiac Date: Fri, 10 Dec 2021 15:27:06 +0100 Subject: [PATCH 1/2] clap update from 3.0.0-beta.2 to rc.3 renamed Args::about() to help() See [#3075] (https://github.com/clap-rs/clap/issues/3075) and [CHANGELOG] (https://github.com/clap-rs/clap/blob/ee2d70f8ef40025beb2ef901e39119ed1f809533/CHANGELOG.md?plain=1#L109) --- Cargo.lock | 38 ++++++++++++++++---------------------- Cargo.toml | 4 ++-- src/lib.rs | 12 ++++++------ 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a29ada..c66ed50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,11 +1,13 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aoc-main" -version = "0.3.0" +version = "0.3.1" dependencies = [ "attohttpc", - "clap 3.0.0-beta.2", + "clap 3.0.0-rc.3", "colored", "criterion", "dirs", @@ -147,16 +149,14 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-beta.2" +version = "3.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142" +checksum = "098d281b47bf725a0bddd829e0070ee76560faab8af123050a86c440d7f0a1fd" dependencies = [ "bitflags", "indexmap", "os_str_bytes", - "textwrap 0.12.1", - "unicode-width", - "vec_map", + "textwrap 0.14.2", ] [[package]] @@ -476,9 +476,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -567,9 +567,12 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "2.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] [[package]] name = "percent-encoding" @@ -899,12 +902,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.12.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789" -dependencies = [ - "unicode-width", -] +checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" [[package]] name = "tinytemplate" @@ -979,12 +979,6 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "walkdir" version = "2.3.1" diff --git a/Cargo.toml b/Cargo.toml index c599e2c..9475acb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aoc-main" description = "A macro which defines a handful main for the Advent of Code" -version = "0.3.0" +version = "0.3.1" authors = ["Rémi Dupré "] repository = "https://github.com/remi-dupre/aoc" license = "Apache-2.0" @@ -15,7 +15,7 @@ bench = ["criterion"] [dependencies] attohttpc = { version = "0.16.0", default_features = false, features = ["tls"] } -clap = { version = "3.0.0-beta.2", default_features = false, features = ["std"] } +clap = { version = "3.0.0-rc.3", default_features = false, features = ["std"] } colored = "2.0.0" dirs = "3.0.1" diff --git a/src/lib.rs b/src/lib.rs index 33c43b8..657aa0c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,13 +14,13 @@ use clap::{App, Arg, ValueHint}; pub fn args(year: u16) -> App<'static> { App::new(format!("Advent of Code {}", year)) .author("Rémi D. ") - .about("Main page of the event: https://adventofcode.com/") + .override_help("Main page of the event: https://adventofcode.com/") .arg( Arg::new("stdin") .short('i') .long("stdin") .conflicts_with("file") - .about("Read input from stdin instead of downloading it"), + .help("Read input from stdin instead of downloading it"), ) .arg( Arg::new("file") @@ -29,7 +29,7 @@ pub fn args(year: u16) -> App<'static> { .long("file") .conflicts_with("stdin") .value_hint(ValueHint::FilePath) - .about("Read input from file instead of downloading it"), + .help("Read input from file instead of downloading it"), ) .arg( Arg::new("days") @@ -37,20 +37,20 @@ pub fn args(year: u16) -> App<'static> { .short('d') .long("day") .value_name("day num") - .about("Days to execute. By default all implemented days will run"), + .help("Days to execute. By default all implemented days will run"), ) .arg( Arg::new("bench") .short('b') .long("bench") - .about("Run criterion benchmarks"), + .help("Run criterion benchmarks"), ) .arg( Arg::new("all") .short('a') .long("all") .conflicts_with("days") - .about("Run all days"), + .help("Run all days"), ) } From 3fdc2d33b4990c6d77e9c27571868e61893d7ff0 Mon Sep 17 00:00:00 2001 From: frobiac Date: Fri, 10 Dec 2021 16:32:59 +0100 Subject: [PATCH 2/2] Revert to App::about(), and typo in comment --- src/lib.rs | 2 +- src/parse/gen_run.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 657aa0c..ccbca78 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ use clap::{App, Arg, ValueHint}; pub fn args(year: u16) -> App<'static> { App::new(format!("Advent of Code {}", year)) .author("Rémi D. ") - .override_help("Main page of the event: https://adventofcode.com/") + .about("Main page of the event: https://adventofcode.com/") .arg( Arg::new("stdin") .short('i') diff --git a/src/parse/gen_run.rs b/src/parse/gen_run.rs index c52984c..1bc29a3 100644 --- a/src/parse/gen_run.rs +++ b/src/parse/gen_run.rs @@ -36,7 +36,7 @@ macro_rules! run_day { #[macro_export] macro_rules! run_gen { - // No generator is needed: default begavior is to just pass input &str + // No generator is needed: default behavior is to just pass input &str ( $day: ident, $data: expr, { gen_default } ) => {{ Some($data) }};