[Merged by Bors] - migrated to clap 3

boa_cli/Cargo.toml

@@ -16,7 +16,7 @@ boa_engine = { path = "../boa_engine", features = ["deser", "console"], version
 boa_interner = { path = "../boa_interner", version = "0.14.0" }
 rustyline = "9.1.2"
 rustyline-derive = "0.6.0"
-structopt = "0.3.26"
+clap = { version = "3.1.6", features = ["derive"] }
 serde_json = "1.0.79"
 colored = "2.0.0"
 regex = "1.5.5"

boa_cli/src/main.rs

@@ -64,8 +64,8 @@ use boa_interner::Interner;
 use colored::{Color, Colorize};
 use rustyline::{config::Config, error::ReadlineError, EditMode, Editor};
 use std::{fs::read, io, path::PathBuf};
-use structopt::{clap::arg_enum, StructOpt};
-
+//use structopt::{clap::arg_enum, StructOpt};
+use clap::{ArgEnum, Parser};
 mod helper;
 
 #[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
@@ -84,29 +84,29 @@ const READLINE_COLOR: Color = Color::Cyan;
 // is an optional argument that optionally takes a value ([--opt=[val]]).
 // https://docs.rs/structopt/0.3.11/structopt/#type-magic
 #[allow(clippy::option_option)]
-#[derive(Debug, StructOpt)]
-#[structopt(author, about, name = "boa")]
+#[derive(Debug, Parser)]
+#[clap(author, about, name = "boa")]
 struct Opt {
     /// The JavaScript file(s) to be evaluated.
-    #[structopt(name = "FILE", parse(from_os_str))]
+    #[clap(name = "FILE", parse(from_os_str))]
     files: Vec<PathBuf>,
 
     /// Dump the AST to stdout with the given format.
-    #[structopt(
+    #[clap(
         long,
-        short = "a",
+        short = 'a',
         value_name = "FORMAT",
-        possible_values = &DumpFormat::variants(),
-        case_insensitive = true
+        case_insensitive = true,
+        arg_enum
     )]
     dump_ast: Option<Option<DumpFormat>>,
 
     /// Dump the AST to stdout with the given format.
-    #[structopt(long = "trace", short = "t")]
+    #[clap(long = "trace", short = 't')]
     trace: bool,
 
     /// Use vi mode in the REPL
-    #[structopt(long = "vi")]
+    #[clap(long = "vi")]
     vi_mode: bool,
 }
 
@@ -117,6 +117,7 @@ impl Opt {
     }
 }
 
+/*
 arg_enum! {
     /// The different types of format available for dumping.
     ///
@@ -137,6 +138,14 @@ arg_enum! {
         // This is a pretty printed json format.
         JsonPretty,
     }
+} **/
+
+#[derive(Debug, Clone, ArgEnum)]
+#[clap(name = 'a')]
+enum DumpFormat {
+    Debug,
+    Json,
+    JsonPretty,
 }
 
 /// Parses the the token stream into an AST and returns it.