chore: Update dependencies, switch from structop to clap v3

Author: CohenArthur

Cargo.toml

@@ -2,12 +2,13 @@
 edition = "2021"
 name = "testsuite-adaptor"
 version = "0.1.0"
+
 [dependencies]
 anyhow = "1.0"
+clap = { version = "4.4.2", features = ["derive"] }
 colored = "2.0"
-rayon = "1.5"
-structopt = "0.3"
+rayon = "1.7"
 thiserror = "1.0"
 wait-timeout = "0.2"
-walkdir = "2.0"
-which = "4.2"
+walkdir = "2.3"
+which = "4.4"

src/args.rs

@@ -2,28 +2,28 @@ use crate::passes::PassKind;
 
 use std::path::PathBuf;
 
-use structopt::StructOpt;
+use clap::Parser;
 
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct Args {
-    #[structopt(
+    #[arg(
         short,
         long,
         help = "output directory which will contain the new tests"
     )]
     pub(crate) output_dir: PathBuf,
-    #[structopt(short, long, help = "generated YAML ftf file name")]
+    #[arg(short, long, help = "generated YAML ftf file name")]
     pub(crate) yaml: PathBuf,
-    #[structopt(short, long, help = "path to the rustc compiler to use")]
+    #[arg(short, long, help = "path to the rustc compiler to use")]
     pub(crate) rustc: PathBuf,
-    #[structopt(short, long, help = "path to the gccrs compiler to use")]
+    #[arg(short, long, help = "path to the gccrs compiler to use")]
     pub(crate) gccrs: PathBuf,
-    #[structopt(long, help = "path to a cloned rust repository")]
+    #[arg(long, help = "path to a cloned rust repository")]
     pub(crate) rust_path: PathBuf,
-    #[structopt(long, help = "path to a cloned gccrs repository")]
+    #[arg(long, help = "path to a cloned gccrs repository")]
     pub(crate) gccrs_path: PathBuf,
-    #[structopt(short, long, help = "pass to to run in the adaptor")]
+    #[arg(short, long, help = "pass to to run in the adaptor")]
     pub(crate) pass: PassKind,
-    #[structopt(short, long, help = "amount of threads to use", default_value = "1")]
+    #[arg(short, long, help = "amount of threads to use", default_value = "1")]
     pub(crate) jobs: usize,
 }

src/main.rs

@@ -14,9 +14,9 @@ use args::Args;
 use error::Error;
 use passes::{Pass, PassKind};
 
+use clap::Parser;
 use rayon::prelude::*;
 use steps::CompileStep;
-use structopt::StructOpt;
 use walkdir::WalkDir;
 use which::which;
 
@@ -124,7 +124,7 @@ fn warn_on_file_not_found(name: &str, path: &Path) {
 }
 
 fn main() -> anyhow::Result<()> {
-    let args = Args::from_args();
+    let args = Args::parse();
     maybe_create_output_dir(&args.output_dir)?;
     if !args.rust_path.exists() {
         return Err(Error::NoRust(args.rust_path).into());

src/passes.rs

@@ -15,7 +15,6 @@ pub use rustc_dejagnu::RustcDejagnu;
 use std::ffi::OsStr;
 use std::fmt::Display;
 use std::path::{Path, PathBuf};
-use std::str::FromStr;
 
 use crate::compiler::Compiler;
 use crate::{args::Args, error::Error};
@@ -154,6 +153,7 @@ pub trait Pass: Sync {
 
 /// Passes to run when generating the test-suite file. One can chose to run only
 /// a specific pass, or multiple of them
+#[derive(Clone, Copy, clap::ValueEnum)]
 pub enum PassKind {
     /// Generates test cases for running gccrs and rustc in parse-only mode on
     /// the rustc test suite
@@ -183,24 +183,6 @@ impl Display for InvalidPassKind {
     }
 }
 
-impl FromStr for PassKind {
-    type Err = InvalidPassKind;
-
-    fn from_str(s: &str) -> Result<PassKind, Self::Err> {
-        match s {
-            "gccrs-parsing" => Ok(PassKind::GccrsParsing),
-            "rustc-dejagnu" => Ok(PassKind::RustcDejagnu),
-            "gccrs-rustc-success" => Ok(PassKind::GccrsRustcSucess),
-            "gccrs-rustc-success-no-std" => Ok(PassKind::GccrsRustcSucessNoStd),
-            "gccrs-rustc-success-no-core" => Ok(PassKind::GccrsRustcSucessNoCore),
-            "blake3" => Ok(PassKind::Blake3),
-            "libcore" => Ok(PassKind::LibCore),
-            "ast-export" => Ok(PassKind::AstExport),
-            s => Err(InvalidPassKind(s.to_string())),
-        }
-    }
-}
-
 impl Display for PassKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let s = match &self {