Dependency gardening for Wasmtime

Cargo.toml

@@ -60,7 +60,7 @@ test-programs = { path = "crates/test-programs" }
 wasmtime-runtime = { workspace = true }
 tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
 wast = { workspace = true }
-criterion = "0.4.0"
+criterion = "0.5.0"
 num_cpus = "1.13.0"
 memchr = "2.4"
 async-trait = { workspace = true }
@@ -187,14 +187,16 @@ regalloc2 = "0.9.2"
 
 # cap-std family:
 target-lexicon = { version = "0.12.3", default-features = false, features = ["std"] }
-cap-std = "1.0.12"
-cap-rand = { version = "1.0.12", features = ["small_rng"] }
-cap-fs-ext = "1.0.12"
-cap-time-ext = "1.0.0"
-fs-set-times = "0.19.0"
-system-interface = { version = "0.25.1", features = ["cap_std_impls"] }
-io-lifetimes = { version = "1.0.0", default-features = false }
-rustix = "0.37.13"
+cap-std = "2.0.0"
+cap-rand = { version = "2.0.0", features = ["small_rng"] }
+cap-fs-ext = "2.0.0"
+cap-time-ext = "2.0.0"
+cap-tempfile = "2.0.0"
+fs-set-times = "0.20.0"
+system-interface = { version = "0.26.0", features = ["cap_std_impls"] }
+io-lifetimes = { version = "2.0.2", default-features = false }
+io-extras = "0.18.0"
+rustix = "0.38.4"
 
 # wit-bindgen:
 wit-bindgen = { version = "0.7.0", default-features = false }
@@ -212,21 +214,21 @@ wit-component = "0.12.0"
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------
-object = { version = "0.30.3", default-features = false, features = ['read_core', 'elf', 'std'] }
+object = { version = "0.31.1", default-features = false, features = ['read_core', 'elf', 'std'] }
 gimli = { version = "0.27.0", default-features = false, features = ['read', 'std'] }
 anyhow = "1.0.22"
 windows-sys = "0.48.0"
 env_logger = "0.10"
 log = { version = "0.4.8", default-features = false }
-clap = { version = "3.2.0", features = ["color", "suggestions", "derive"] }
+clap = { version = "4.3.12", features = ["color", "suggestions", "derive"] }
 hashbrown = "0.13.2"
 capstone = "0.9.0"
 once_cell = "1.12.0"
 smallvec = { version = "1.6.1", features = ["union"] }
 tracing = "0.1.26"
-bitflags = "1.2"
-thiserror = "1.0.15"
-async-trait = "0.1.42"
+bitflags = "2.0"
+thiserror = "1.0.43"
+async-trait = "0.1.71"
 heck = "0.4"
 similar = "2.1.0"
 toml = "0.5.9"
@@ -241,6 +243,8 @@ filecheck = "0.5.0"
 libc = "0.2.60"
 file-per-thread-logger = "0.2.0"
 indexmap = "2.0.0"
+pretty_env_logger = "0.5.0"
+syn = "2.0.25"
 
 [features]
 default = [

cranelift/Cargo.toml

@@ -38,7 +38,7 @@ termcolor = "1.1.2"
 capstone = { workspace = true, optional = true }
 wat = { workspace = true, optional = true }
 target-lexicon = { workspace = true, features = ["std"] }
-pretty_env_logger = "0.4.0"
+pretty_env_logger = { workspace = true }
 rayon = { version = "1", optional = true }
 indicatif = "0.13.0"
 thiserror = { workspace = true }

cranelift/codegen/Cargo.toml

@@ -36,7 +36,7 @@ sha2 = { version = "0.10.2", optional = true }
 # accomodated in `tests`.
 
 [dev-dependencies]
-criterion = { version = "0.4.0", features = ["html_reports"] }
+criterion = { version = "0.5.0", features = ["html_reports"] }
 similar = "2.1.0"
 
 [build-dependencies]

cranelift/src/clif-util.rs

@@ -142,3 +142,9 @@ fn main() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn verify_cli() {
+    use clap::CommandFactory;
+    Commands::command().debug_assert()
+}

cranelift/src/wasm.rs

@@ -111,7 +111,7 @@ pub struct Options {
     color: ColorOpt,
 }
 
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Clone)]
 enum ColorOpt {
     Auto,
     Never,

crates/cache/Cargo.toml

@@ -32,5 +32,5 @@ rustix = { workspace = true, features = ["process"] }
 [dev-dependencies]
 filetime = "0.2.7"
 once_cell = { workspace = true }
-pretty_env_logger = "0.4.0"
+pretty_env_logger = { workspace = true }
 tempfile = "3"

crates/cli-flags/Cargo.toml

@@ -12,7 +12,7 @@ edition.workspace = true
 anyhow = { workspace = true }
 clap = { workspace = true }
 file-per-thread-logger = { workspace = true }
-pretty_env_logger = "0.4.0"
+pretty_env_logger = { workspace = true }
 rayon = "1.5.0"
 wasmtime = { workspace = true }
 

crates/cli-flags/src/lib.rs

@@ -107,11 +107,11 @@ fn init_file_per_thread_logger(prefix: &'static str) {
 #[cfg_attr(test, derive(Debug, PartialEq))]
 pub struct CommonOptions {
     /// Use specified configuration file
-    #[clap(long, parse(from_os_str), value_name = "CONFIG_PATH")]
+    #[clap(long, value_name = "CONFIG_PATH")]
     pub config: Option<PathBuf>,
 
     /// Disable logging
-    #[clap(long, conflicts_with = "log-to-files")]
+    #[clap(long, conflicts_with = "log_to_files")]
     pub disable_logging: bool,
 
     /// Log to per-thread log files instead of stderr
@@ -131,11 +131,11 @@ pub struct CommonOptions {
     pub disable_parallel_compilation: bool,
 
     /// Enable or disable WebAssembly features
-    #[clap(long, value_name = "FEATURE,FEATURE,...", parse(try_from_str = parse_wasm_features))]
+    #[clap(long, value_name = "FEATURE,FEATURE,...", value_parser = parse_wasm_features)]
     pub wasm_features: Option<WasmFeatures>,
 
     /// Enable or disable WASI modules
-    #[clap(long, value_name = "MODULE,MODULE,...", parse(try_from_str = parse_wasi_modules))]
+    #[clap(long, value_name = "MODULE,MODULE,...", value_parser = parse_wasi_modules)]
     pub wasi_modules: Option<WasiModules>,
 
     /// Generate jitdump file (supported on --features=profiling build)
@@ -148,14 +148,20 @@ pub struct CommonOptions {
     #[clap(
         long,
         value_name = "LEVEL",
-        parse(try_from_str = parse_opt_level),
+        value_parser = parse_opt_level,
         verbatim_doc_comment,
     )]
     pub opt_level: Option<wasmtime::OptLevel>,
 
     /// Set a Cranelift setting to a given value.
     /// Use `wasmtime settings` to list Cranelift settings for a target.
-    #[clap(long = "cranelift-set", value_name = "NAME=VALUE", number_of_values = 1, verbatim_doc_comment, parse(try_from_str = parse_cranelift_flag))]
+    #[clap(
+        long = "cranelift-set",
+        value_name = "NAME=VALUE",
+        number_of_values = 1,
+        verbatim_doc_comment,
+        value_parser = parse_cranelift_flag,
+    )]
     pub cranelift_set: Vec<(String, String)>,
 
     /// Enable a Cranelift boolean setting or preset.

crates/component-macro/Cargo.toml

@@ -19,7 +19,7 @@ doctest = false
 anyhow = "1.0"
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = { version = "1.0", features = ["extra-traits"] }
+syn = { workspace = true, features = ["extra-traits"] }
 wasmtime-component-util = { workspace = true }
 wasmtime-wit-bindgen = { workspace = true }
 wit-parser = { workspace = true }

crates/component-macro/src/bindgen.rs

@@ -252,7 +252,7 @@ impl Parse for Opt {
             let contents;
             let _lbrace = braced!(contents in input);
             let fields: Punctuated<(String, String, String), Token![,]> =
-                contents.parse_terminated(trappable_error_field_parse)?;
+                contents.parse_terminated(trappable_error_field_parse, Token![,])?;
             Ok(Opt::TrappableErrorType(
                 fields
                     .into_iter()
@@ -273,7 +273,7 @@ impl Parse for Opt {
             let contents;
             let _lbrace = braced!(contents in input);
             let fields: Punctuated<(String, String), Token![,]> =
-                contents.parse_terminated(with_field_parse)?;
+                contents.parse_terminated(with_field_parse, Token![,])?;
             Ok(Opt::With(HashMap::from_iter(fields.into_iter())))
         } else {
             Err(l.error())