Migrate from structopt to clap

Structopt is no longer maintained and its functionality has been merged
into clap-v3. Migrating to the latter means that som-rs will no longer
fail with the cargo security audit tool [1].

[1]: https://crates.io/crates/cargo-audit

som-interpreter-ast/Cargo.toml

@@ -15,7 +15,7 @@ som-parser = { package = "som-parser-symbols", path = "../som-parser-symbols", v
 # som-parser = { package = "som-parser-text", path = "../som-parser-text", version = "0.1.0" }
 
 # CLI interface
-structopt = "0.3.25"
+clap = { version = "3.0", features = ["derive"] }
 
 # error handling
 anyhow = "1.0.51"

som-interpreter-ast/src/main.rs

@@ -7,9 +7,9 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use anyhow::anyhow;
+use clap::Parser;
 #[cfg(feature = "jemalloc")]
 use jemallocator::Jemalloc;
-use structopt::StructOpt;
 
 mod shell;
 
@@ -21,22 +21,22 @@ use som_interpreter_ast::value::Value;
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
-#[derive(Debug, Clone, PartialEq, StructOpt)]
+#[derive(Debug, Clone, PartialEq, clap::StructOpt)]
 #[structopt(about, author)]
 struct Options {
     /// Files to evaluate.
-    #[structopt(name = "FILE")]
+    #[clap(name = "FILE")]
     file: Option<PathBuf>,
 
-    #[structopt(name = "ARGS")]
+    #[clap(name = "ARGS")]
     args: Vec<String>,
 
     /// Set search path for application classes.
-    #[structopt(short, long)]
+    #[clap(short, long, multiple_values(true))]
     classpath: Vec<PathBuf>,
 
     /// Enable verbose output (with timing information).
-    #[structopt(short = "v")]
+    #[clap(short = 'v')]
     verbose: bool,
 }
 

som-interpreter-bc/Cargo.toml

@@ -15,7 +15,7 @@ som-parser = { package = "som-parser-symbols", path = "../som-parser-symbols", v
 # som-parser = { package = "som-parser-text", path = "../som-parser-text", version = "0.1.0" }
 
 # CLI interface
-structopt = "0.3.25"
+clap = { version = "3.0", features = ["derive"] }
 
 # error handling
 anyhow = "1.0.51"

som-interpreter-bc/src/main.rs

@@ -7,9 +7,9 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use anyhow::{bail, Context};
+use clap::Parser;
 #[cfg(feature = "jemalloc")]
 use jemallocator::Jemalloc;
-use structopt::StructOpt;
 
 mod shell;
 
@@ -23,8 +23,8 @@ use som_interpreter_bc::value::Value;
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
-#[derive(Debug, Clone, PartialEq, StructOpt)]
-#[structopt(about, author)]
+#[derive(Debug, Clone, PartialEq, clap::StructOpt)]
+#[clap(about, author)]
 struct Options {
     /// File to evaluate.
     file: Option<PathBuf>,
@@ -33,15 +33,15 @@ struct Options {
     args: Vec<String>,
 
     /// Set search path for application classes.
-    #[structopt(long, short)]
+    #[clap(long, short, multiple_values(true))]
     classpath: Vec<PathBuf>,
 
     /// Disassemble the class, instead of executing.
-    #[structopt(long, short)]
+    #[clap(long, short)]
     disassemble: bool,
 
     /// Enable verbose output (with timing information).
-    #[structopt(short = "v")]
+    #[clap(short = 'v')]
     verbose: bool,
 }