bump dependencies

Author: y21

Cargo.lock

@@ -10,8 +10,8 @@ stress_gc = ["dash_vm/stress_gc"]
 [dependencies]
 dash_node_impl = { path = "../crates/dash_node_impl", optional = true }
 anyhow = "1.0"
-clap = { version = "3.0.0", features = ["std"], default-features = false }
-rustyline = "9.1.2"
+clap = { version = "4.5.0", features = ["std"], default-features = false }
+rustyline = "15.0.0"
 tokio = { version = "1.24.0", features = ["full"] }
 dash_rt = { path = "../crates/dash_rt", features = ["random"] }
 dash_lexer = { path = "../crates/dash_lexer" }
@@ -31,4 +31,4 @@ dash_rt_modules = { path = "../crates/dash_rt_modules", features = [
 ] }
 tracing-subscriber = "0.3.15"
 tracing = "0.1.36"
-colorful = "0.2.1"
+owo-colors = "4.2.0"

cli/Cargo.toml

@@ -1,7 +1,7 @@
 use std::io::Write;
 use std::{fs, io};
 
-use anyhow::{Context, anyhow};
+use anyhow::anyhow;
 use clap::ArgMatches;
 use dash_compiler::transformations;
 use dash_middle::interner::StringInterner;
@@ -12,15 +12,15 @@ use dash_optimizer::consteval::ConstFunctionEvalCtx;
 use dash_optimizer::type_infer::name_res;
 
 pub fn dump(arg: &ArgMatches) -> anyhow::Result<()> {
-    let dump_ir = arg.is_present("ir");
-    let dump_ast = arg.is_present("ast");
-    let dump_js = arg.is_present("js");
-    let dump_bytecode = arg.is_present("bytecode");
-    let dump_tokens = arg.is_present("tokens");
-    let dump_types = arg.is_present("types");
+    let dump_ir = *arg.get_one::<bool>("ir").unwrap();
+    let dump_ast = *arg.get_one::<bool>("ast").unwrap();
+    let dump_js = *arg.get_one::<bool>("js").unwrap();
+    let dump_bytecode = *arg.get_one::<bool>("bytecode").unwrap();
+    let dump_tokens = *arg.get_one::<bool>("tokens").unwrap();
+    let dump_types = *arg.get_one::<bool>("types").unwrap();
 
     let opt = *arg.get_one::<OptLevel>("opt").unwrap();
-    let path = arg.value_of("file").context("Missing file")?;
+    let path = arg.get_one::<String>("file").unwrap();
     let source = fs::read_to_string(path)?;
 
     let interner = &mut StringInterner::new();

cli/src/cmd/dump.rs

@@ -8,7 +8,7 @@ use dash_vm::eval::EvalError;
 use dash_vm::value::Root;
 
 pub fn eval(args: &ArgMatches) -> anyhow::Result<()> {
-    let source = args.value_of("source").context("Missing source")?;
+    let source = args.get_one::<String>("source").context("Missing source")?;
     let opt = *args.get_one::<OptLevel>("opt").unwrap();
 
     tokio::runtime::Runtime::new()?.block_on(async move {

cli/src/cmd/eval.rs

@@ -4,10 +4,10 @@ use dash_rt::format_value;
 use dash_rt::runtime::Runtime;
 use dash_vm::eval::EvalError;
 use dash_vm::value::Root;
-use rustyline::Editor;
+use rustyline::DefaultEditor;
 
 pub fn repl() -> anyhow::Result<()> {
-    let mut rl = Editor::<()>::new();
+    let mut rl = DefaultEditor::new()?;
 
     tokio::runtime::Runtime::new()?.block_on(async move {
         let mut rt = Runtime::new(None);
@@ -17,7 +17,7 @@ pub fn repl() -> anyhow::Result<()> {
                 continue;
             }
 
-            rl.add_history_entry(&input);
+            rl.add_history_entry(&input).unwrap();
 
             rt.vm_mut().with_scope(|scope| {
                 match scope.eval(&input, OptLevel::Aggressive) {

cli/src/cmd/repl.rs

@@ -5,22 +5,21 @@ use dash_rt::runtime::Runtime;
 use dash_vm::eval::EvalError;
 use dash_vm::value::Root;
 use std::fs;
-use std::str::FromStr;
 use std::time::Instant;
 
 use anyhow::Context;
 use clap::ArgMatches;
 
 pub fn run(args: &ArgMatches) -> anyhow::Result<()> {
-    let path = args.value_of("file").context("Missing source")?;
-    let nodejs = args.is_present("node");
+    let path = args.get_one::<String>("file").context("Missing source")?;
+    let nodejs = *args.get_one::<bool>("node").unwrap();
     let initial_gc_threshold = args
-        .value_of("initial-gc-threshold")
-        .map(<usize as FromStr>::from_str)
+        .get_one::<&str>("initial-gc-threshold")
+        .map(|v| v.parse())
         .transpose()?;
     let opt = *args.get_one::<OptLevel>("opt").unwrap();
-    let before = args.is_present("timing").then(Instant::now);
-    let quiet = args.is_present("quiet");
+    let before = args.get_one::<bool>("timing").unwrap().then(Instant::now);
+    let quiet = *args.get_one::<bool>("quiet").unwrap();
 
     if nodejs {
         #[cfg(feature = "nodejs")]

cli/src/cmd/run.rs

@@ -1,9 +1,9 @@
 use std::backtrace::{Backtrace, BacktraceStatus};
 
-use anyhow::{Context, bail};
-use clap::{Arg, Command};
-use colorful::Colorful;
+use anyhow::bail;
+use clap::{Arg, ArgAction, Command};
 use dash_optimizer::OptLevel;
+use owo_colors::OwoColorize;
 
 mod cmd;
 mod util;
@@ -14,16 +14,14 @@ fn main() -> anyhow::Result<()> {
     let opt_level = Arg::new("opt")
         .short('O')
         .long("opt")
-        .value_parser(|val: &_| OptLevel::from_level(val).context("unknown opt level"))
-        .default_value("1")
-        .possible_values(["0", "1", "2"]);
+        .value_parser(|val: &_| OptLevel::from_level(val).ok_or("unknown opt level (must be between 0 and 3)"))
+        .default_value("1");
 
-    let nodejs = Arg::new("node").long("node").takes_value(false);
+    let nodejs = Arg::new("node").long("node").action(ArgAction::SetTrue);
 
     let initial_gc_threshold = Arg::new("initial-gc-threshold")
         .help("Sets the initial GC object threshold, i.e. the RSS at which the first GC cycle triggers.")
         .long("initial-gc-threshold")
-        .takes_value(true)
         .required(false);
 
     let app = Command::new("dash")
@@ -39,8 +37,8 @@ fn main() -> anyhow::Result<()> {
             Command::new("run")
                 .override_help("Run a JavaScript file")
                 .arg(Arg::new("file").required(true))
-                .arg(Arg::new("timing").short('t').long("timing").takes_value(false))
-                .arg(Arg::new("quiet").short('q').long("quiet").takes_value(false))
+                .arg(Arg::new("timing").short('t').long("timing").action(ArgAction::SetTrue))
+                .arg(Arg::new("quiet").short('q').long("quiet").action(ArgAction::SetTrue))
                 .arg(opt_level.clone())
                 .arg(nodejs)
                 .arg(initial_gc_threshold.clone()),
@@ -50,12 +48,12 @@ fn main() -> anyhow::Result<()> {
             Command::new("dump")
                 .override_help("Dumps intermediate code representation")
                 .arg(Arg::new("file").required(true))
-                .arg(Arg::new("ir").long("ir").takes_value(false))
-                .arg(Arg::new("ast").long("ast").takes_value(false))
-                .arg(Arg::new("js").long("js").takes_value(false))
-                .arg(Arg::new("bytecode").long("bytecode").takes_value(false))
-                .arg(Arg::new("tokens").long("tokens").takes_value(false))
-                .arg(Arg::new("types").long("types").takes_value(false))
+                .arg(Arg::new("ir").long("ir").action(ArgAction::SetTrue))
+                .arg(Arg::new("ast").long("ast").action(ArgAction::SetTrue))
+                .arg(Arg::new("js").long("js").action(ArgAction::SetTrue))
+                .arg(Arg::new("bytecode").long("bytecode").action(ArgAction::SetTrue))
+                .arg(Arg::new("tokens").long("tokens").action(ArgAction::SetTrue))
+                .arg(Arg::new("types").long("types").action(ArgAction::SetTrue))
                 .arg(opt_level),
         );
 

cli/src/main.rs

@@ -12,11 +12,11 @@ decompile = []
 [dependencies]
 dash_regex = { path = "../dash_regex" }
 dash_middle = { path = "../dash_middle" }
-strum = "0.24.0"
-strum_macros = "0.24.0"
+strum = "0.27.0"
+strum_macros = "0.27.0"
 dash_parser = { path = "../dash_parser", optional = true }
 dash_lexer = { path = "../dash_lexer", optional = true }
 dash_optimizer = { path = "../dash_optimizer" }
 dash_log = { path = "../dash_log" }
 tracing = "0.1.37"
-rustc-hash = "1.1.0"
+rustc-hash = "2.1.0"

crates/dash_compiler/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2024"
 
 [dependencies]
 dash_middle = { path = "../dash_middle" }
-thiserror = "1.0.34"
+thiserror = "2.0.12"

crates/dash_decompiler/Cargo.toml

@@ -9,4 +9,4 @@ edition = "2024"
 dash_vm = { path = "../dash_vm" }
 dash_middle = { path = "../dash_middle" }
 dash_rt = { path = "../dash_rt" }
-libloading = "0.7"
+libloading = "0.8"