From ebdddc760f87dfba0dce25a642c9eb9697b4e658 Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Mon, 10 Jan 2022 20:35:45 -0500 Subject: [PATCH] Update MFEK clap fork to 3.0.5 Although I once thought that it's likely we'd be able to go back to master `clap`, MFEK might have to maintain its fork indefinitely. `clap`'s maintainer @epage unfortunately wrote in clap-rs/clap#3008: > We might find it just isn't worth completing this. --- Cargo.lock | 22 ++++++++++++---------- Cargo.toml | 2 +- src/constant_width_stroke.rs | 2 +- src/nib_stroke.rs | 8 ++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d968e92..d75e25a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "MFEKmath" version = "0.1.0" -source = "git+https://github.com/MFEK/math.rlib?branch=main#a575e35a9076431d9c6e4b56824acd8e3b9e9520" +source = "git+https://github.com/MFEK/math.rlib?branch=main#f3687b23cd0eec0fb454d82d2b51076bf50ab687" dependencies = [ "flo_curves", "glifparser 1.2.0 (git+https://github.com/MFEK/glifparser.rlib?branch=master)", @@ -21,7 +21,7 @@ name = "MFEKstroke" version = "0.0.0" dependencies = [ "MFEKmath", - "clap 3.0.1", + "clap 3.0.5", "env_logger", "fontforge-sys", "glifparser 1.2.0 (git+https://github.com/MFEK/glifparser.rlib?branch=master)", @@ -121,9 +121,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" -version = "3.9.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c9d2f2b0fb88a112154ed81e30b0a491c29322afe1db3b6eec5811f5ba0" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "bytemuck" @@ -198,8 +198,8 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.1" -source = "git+https://github.com/MFEK/clap.rlib?branch=validator_all#f48280c187f7b2307917ee0d9d6fb8379daaff82" +version = "3.0.5" +source = "git+https://github.com/MFEK/clap.rlib?branch=master#c29cebf4b9bd7fb5ef8dc5a542a547778db43377" dependencies = [ "atty", "bitflags", @@ -362,10 +362,11 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "glifparser" version = "1.2.0" -source = "git+https://github.com/MFEK/glifparser.rlib?branch=master#6aaf88012709fce8fd21ccf0b61d1074a95307a3" +source = "git+https://github.com/MFEK/glifparser.rlib?branch=master#d9aa702df074094f1509f071e15e11cc696a4ca3" dependencies = [ "image", "integer_or_float", + "itertools", "kurbo", "log", "plist", @@ -378,10 +379,11 @@ dependencies = [ [[package]] name = "glifparser" version = "1.2.0" -source = "git+https://github.com/MFEK/glifparser.rlib#6aaf88012709fce8fd21ccf0b61d1074a95307a3" +source = "git+https://github.com/MFEK/glifparser.rlib#d9aa702df074094f1509f071e15e11cc696a4ca3" dependencies = [ "image", "integer_or_float", + "itertools", "kurbo", "log", "plist", @@ -454,9 +456,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", diff --git a/Cargo.toml b/Cargo.toml index bbfe560..cf2334e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] # parse command line arguments -clap = { git = "https://github.com/MFEK/clap.rlib", branch = "validator_all" } +clap = { git = "https://github.com/MFEK/clap.rlib", branch = "master" } # parses .glif files glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["mfek"] } diff --git a/src/constant_width_stroke.rs b/src/constant_width_stroke.rs index 053ae84..a846f93 100644 --- a/src/constant_width_stroke.rs +++ b/src/constant_width_stroke.rs @@ -272,7 +272,7 @@ pub fn cws_cli(matches: &clap::ArgMatches) { width: path.width, unicode: path.unicode, name: path.name, - lib: None, + lib: path.lib, components: path.components, guidelines: path.guidelines, images: path.images, diff --git a/src/nib_stroke.rs b/src/nib_stroke.rs index 45fc1c6..7ec3d48 100644 --- a/src/nib_stroke.rs +++ b/src/nib_stroke.rs @@ -16,21 +16,21 @@ pub fn clap_app() -> clap::App<'static> { .short('n') .long("nib") .takes_value(true) - .about("The path to the nib file. FontForge is quite strict about these. The .glif must contain a single closed spline, running clockwise, which represents a convex shape.") + .help("The path to the nib file. FontForge is quite strict about these. The .glif must contain a single closed spline, running clockwise, which represents a convex shape.") .required(true)) .arg(Arg::new("input") .display_order(2) .short('i') .long("input") .takes_value(true) - .about("The path to the input path file.") + .help("The path to the input path file.") .required(true)) .arg(Arg::new("output") .display_order(3) .short('o') .long("output") .takes_value(true) - .about("The path where the output .glif will be saved.") + .help("The path where the output .glif will be saved.") .required(true)) .arg(Arg::new("accuracy") .display_order(4) @@ -38,7 +38,7 @@ pub fn clap_app() -> clap::App<'static> { .long("accuracy") .takes_value(true) .default_value("0.25") - .about(" Accuracy target") + .help(" Accuracy target") .validator(super::arg_validator_positive_f64) .required(false)) }