diff --git a/font-codegen/Cargo.toml b/font-codegen/Cargo.toml index ee4f0ad4b..018159087 100644 --- a/font-codegen/Cargo.toml +++ b/font-codegen/Cargo.toml @@ -21,7 +21,7 @@ proc-macro2 = { version = "1.0", features = ["span-locations"]} quote = "1.0" toml = "0.7.5" serde = {version = "1.0", features = ["derive"] } -xflags = "0.2.4" +xflags = "0.3.0" log = "0.4" env_logger = "0.10.0" rayon = "1.5.3" diff --git a/font-codegen/src/main.rs b/font-codegen/src/main.rs index c16995259..a20504c33 100644 --- a/font-codegen/src/main.rs +++ b/font-codegen/src/main.rs @@ -110,15 +110,16 @@ mod flags { xflags::xflags! { /// Generate font table representations cmd args { - cmd file + cmd file { /// Code to generate; either 'parse' or 'compile'. required mode: Mode /// Path to the input file required path: PathBuf - {} - default cmd plan + } + default cmd plan { /// plan path - required path: PathBuf {} + required path: PathBuf + } } } } diff --git a/otexplorer/Cargo.toml b/otexplorer/Cargo.toml index 351c8bb96..1749282ff 100644 --- a/otexplorer/Cargo.toml +++ b/otexplorer/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] -xflags = "0.2.4" +xflags = "0.3.0" read-fonts = { path = "../read-fonts",version = "0.8.0" } font-types = { path = "../font-types",version = "0.3.3" } ansi_term = "0.12.1" diff --git a/otexplorer/src/main.rs b/otexplorer/src/main.rs index 9368f11e8..967f90810 100644 --- a/otexplorer/src/main.rs +++ b/otexplorer/src/main.rs @@ -203,15 +203,13 @@ mod flags { xflags::xflags! { /// Generate font table representations - cmd args + cmd args { required input: PathBuf - { - optional -i, --index index: u32 - optional -l, --list - optional -q, --query query: Query - optional -t, --tables include: String - optional -x, --exclude exclude: String - } - + optional -i, --index index: u32 + optional -l, --list + optional -q, --query query: Query + optional -t, --tables include: String + optional -x, --exclude exclude: String + } } }