Merge pull request #1197 from hannobraun/clap

Upgrade to latest version of clap
hannobraun · Oct 10, 2022 · bc949b1 · bc949b1
2 parents 1e762a8 + 39a901b
commit bc949b1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-app/Cargo.toml b/crates/fj-app/Cargo.toml
@@ -24,7 +24,7 @@ fj-viewer.workspace = true
 fj-window.workspace = true
 
 [dependencies.clap]
-version = "3.2.22"
+version = "4.0.12"
 features = ["derive"]
 
 [dependencies.figment]

diff --git a/crates/fj-app/src/args.rs b/crates/fj-app/src/args.rs
@@ -7,22 +7,22 @@ use fj_math::Scalar;
 
 /// Fornjot - Experimental CAD System
 #[derive(clap::Parser)]
-#[clap(version = env!("FJ_VERSION_STRING"))]
+#[command(version = env!("FJ_VERSION_STRING"))]
 pub struct Args {
     /// The model to open
-    #[clap(short, long)]
+    #[arg(short, long)]
     pub model: Option<PathBuf>,
 
     /// Export model to this path
-    #[clap(short, long)]
+    #[arg(short, long)]
     pub export: Option<PathBuf>,
 
     /// Parameters for the model, each in the form `key=value`
-    #[clap(short, long, parse(try_from_str = parse_parameters))]
+    #[arg(short, long, value_parser = parse_parameters)]
     pub parameters: Option<Parameters>,
 
     /// Model deviation tolerance
-    #[clap[short, long, parse(try_from_str = parse_tolerance)]]
+    #[arg(short, long, value_parser = parse_tolerance)]
     pub tolerance: Option<Tolerance>,
 }
 

diff --git a/tools/automator/Cargo.toml b/tools/automator/Cargo.toml
@@ -18,7 +18,7 @@ url = "2.3.0"
 path = "../autolib"
 
 [dependencies.clap]
-version = "3.2.22"
+version = "4.0.12"
 features = ["derive"]
 
 [dependencies.tokio]

diff --git a/tools/release-operator/Cargo.toml b/tools/release-operator/Cargo.toml
@@ -24,7 +24,7 @@ version = "0.11.11"
 features = ["blocking"]
 
 [dependencies.clap]
-version = "3.2.22"
+version = "4.0.12"
 features = ["std", "derive", "env"]
 default_features = false