Update Clap

sarsko · Apr 10, 2024 · 3075be6 · 3075be6
1 parent a8b3b92
commit 3075be6
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/CreuSAT/Cargo.toml b/CreuSAT/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["Sarek Høverstad Skotåm <sarek.skotam@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-#clap = "4.0.18"
-clap = "2.33.3"
+clap = "4.5"
 rand = "*"
 creusot-contracts = { git = "https://github.com/xldenis/creusot", version = "^0", rev = "1357cc97" }
 

diff --git a/CreuSAT/src/main.rs b/CreuSAT/src/main.rs
@@ -1,27 +1,19 @@
-use clap::{crate_authors, App, AppSettings, Arg};
+use clap::{arg, crate_authors, Command};
 
 #[cfg(creusot)]
 fn main() {}
 
 #[cfg(not(creusot))]
 fn main() {
     use CreuSAT::parser::{parse_cnf, preproc_and_solve};
-    let matches = App::new("\nCreuSAT")
+    let matches = Command::new("\nCreuSAT")
         .author(crate_authors!("\n"))
         .about("A verified SAT solver written in Rust.")
-        .usage("cargo run -- [FLAGS] --file <file>")
-        .setting(AppSettings::ColoredHelp)
-        .setting(AppSettings::DisableVersion)
-        .arg(
-            Arg::with_name("file")
-                .short("f")
-                .long("file")
-                .takes_value(true)
-                .required(true)
-                .help("CNF file to be parsed"),
-        )
+        .disable_colored_help(false)
+        .disable_version_flag(true)
+        .arg(arg!(-f --file <FILENAME>).long("file").required(true).help("CNF file to be parsed"))
         .get_matches();
-    let filename = matches.value_of("file").unwrap();
+    let filename = matches.get_one::<String>("file").unwrap();
     println!("c Reading file '{}'", filename);
     let res = parse_cnf(filename);
     match res {

diff --git a/Friday/Cargo.toml b/Friday/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 
 [dependencies]
-#clap = "2.33.3"
 creusot-contracts = { git = "https://github.com/xldenis/creusot", version = "^0", rev = "1357cc97" }
 
 [features]

diff --git a/JigSAT/Cargo.toml b/JigSAT/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Sarek Høverstad Skotåm <sarek.skotam@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-clap = "2.33.3"
+clap = "4.5"
 log = "0.4"
 rand = "0.8.5"
 

diff --git a/JigSAT/src/main.rs b/JigSAT/src/main.rs
@@ -1,23 +1,15 @@
-use clap::{crate_authors, App, AppSettings, Arg};
+use clap::{arg, crate_authors, Command};
 
 fn main() {
     use JigSAT::parser::{parse_cnf, preproc_and_solve};
-    let matches = App::new("\nJigSAT")
+    let matches = Command::new("\nJigSAT")
         .author(crate_authors!("\n"))
-        .about("A non-verified SAT solver which acts as a playground for CreuSAT.")
-        .usage("cargo run -- [FLAGS] --file <file>")
-        .setting(AppSettings::ColoredHelp)
-        .setting(AppSettings::DisableVersion)
-        .arg(
-            Arg::with_name("file")
-                .short("f")
-                .long("file")
-                .takes_value(true)
-                .required(true)
-                .help("CNF file to be parsed"),
-        )
+        .about("An unverified SAT solver which acts as a playground for CreuSAT.")
+        .disable_colored_help(false)
+        .disable_version_flag(true)
+        .arg(arg!(-f --file <FILENAME>).long("file").required(true).help("CNF file to be parsed"))
         .get_matches();
-    let filename = matches.value_of("file").unwrap();
+    let filename = matches.get_one::<String>("file").unwrap();
     println!("c Reading file '{}'", filename);
     let res = parse_cnf(filename);
     match res {

diff --git a/Robinson/Cargo.toml b/Robinson/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Sarek Høverstad Skotåm <sarek.skotam@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-clap = "2.33.3"
+clap = { version = "4.5", features = ["cargo"] }
 creusot-contracts = { git = "https://github.com/xldenis/creusot", version = "^0", rev = "1357cc97" }
 
 # This is just copied verbatim from CreuSAT.

diff --git a/Robinson/src/main.rs b/Robinson/src/main.rs
@@ -6,24 +6,16 @@ fn main() {}
 
 #[cfg(not(creusot))]
 fn main() {
-    use clap::{crate_authors, App, AppSettings, Arg};
+    use clap::{arg, crate_authors, Command};
     use Robinson::parser::{parse_cnf, preproc_and_solve};
-    let matches = App::new("\nRobinson")
+    let matches = Command::new("\nRobinson")
         .author(crate_authors!("\n"))
         .about("A verified DPLL-based SAT solver written in Rust.")
-        .usage("cargo run -- [FLAGS] --file <file>")
-        .setting(AppSettings::ColoredHelp)
-        .setting(AppSettings::DisableVersion)
-        .arg(
-            Arg::with_name("file")
-                .short("f")
-                .long("file")
-                .takes_value(true)
-                .required(true)
-                .help("CNF file to be parsed"),
-        )
+        .disable_colored_help(false)
+        .disable_version_flag(true)
+        .arg(arg!(-f --file <FILENAME>).long("file").required(true).help("CNF file to be parsed"))
         .get_matches();
-    let filename = matches.value_of("file").unwrap();
+    let filename = matches.get_one::<String>("file").unwrap();
     println!("c Reading file '{}'", filename);
     let res = parse_cnf(filename);
     match res {

diff --git a/Scratch/Cargo.toml b/Scratch/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Sarek Høverstad Skotåm <sarek.skotam@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-clap = "4.5.4"
+clap = "4.5"
 creusot-contracts = { git = "https://github.com/xldenis/creusot", version = "^0", rev = "1357cc97" }
 
 # This is just copied verbatim from CreuSAT.