Update to clap 4.0.9 (#344)

This migrates everything from structopt and clap 3.* to 4.0.9, while
preserving the (sub)command syntax of all the binaries in all the
crates in this repo.

Author: kulakowski-wasm

Cargo.lock

@@ -20,9 +20,8 @@ version = "0.2.0"
 anyhow = "1.0.65"
 bitflags = "1.3.2"
 heck = "0.3"
-structopt = { version = "0.3", default-features = false }
 pulldown-cmark = { version = "0.8", default-features = false }
-clap = { version = "3.2.22", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 
 wasmtime = "1.0"
 wasmtime-wasi = "1.0"
@@ -50,12 +49,12 @@ test = false
 
 [dependencies]
 anyhow = { workspace = true }
-structopt = { version = "0.3", default-features = false }
+clap = { workspace = true }
 wit-bindgen-core = { path = 'crates/bindgen-core' }
-wit-bindgen-gen-guest-rust = { path = 'crates/gen-guest-rust', features = ['structopt'] }
-wit-bindgen-gen-host-wasmtime-rust = { path = 'crates/gen-host-wasmtime-rust', features = ['structopt'] }
-wit-bindgen-gen-host-wasmtime-py = { path = 'crates/gen-host-wasmtime-py', features = ['structopt'] }
-wit-bindgen-gen-host-js = { path = 'crates/gen-host-js', features = ['structopt'] }
-wit-bindgen-gen-guest-c = { path = 'crates/gen-guest-c', features = ['structopt'] }
-wit-bindgen-gen-markdown = { path = 'crates/gen-markdown', features = ['structopt'] }
-wit-bindgen-gen-guest-teavm-java = { path = 'crates/gen-guest-teavm-java', features = ['structopt'] }
+wit-bindgen-gen-guest-rust = { path = 'crates/gen-guest-rust', features = ['clap'] }
+wit-bindgen-gen-host-wasmtime-rust = { path = 'crates/gen-host-wasmtime-rust', features = ['clap'] }
+wit-bindgen-gen-host-wasmtime-py = { path = 'crates/gen-host-wasmtime-py', features = ['clap'] }
+wit-bindgen-gen-host-js = { path = 'crates/gen-host-js', features = ['clap'] }
+wit-bindgen-gen-guest-c = { path = 'crates/gen-guest-c', features = ['clap'] }
+wit-bindgen-gen-markdown = { path = 'crates/gen-markdown', features = ['clap'] }
+wit-bindgen-gen-guest-teavm-java = { path = 'crates/gen-guest-teavm-java', features = ['clap'] }

Cargo.toml

@@ -11,7 +11,7 @@ test = false
 [dependencies]
 wit-bindgen-core = { workspace = true }
 heck = { workspace = true }
-structopt = { workspace = true, optional = true }
+clap = { workspace = true, optional = true }
 
 [dev-dependencies]
 test-helpers = { path = '../test-helpers', features = ['guest-c'] }

crates/gen-guest-c/Cargo.toml

@@ -41,7 +41,7 @@ struct Func {
 }
 
 #[derive(Default, Debug, Clone)]
-#[cfg_attr(feature = "structopt", derive(structopt::StructOpt))]
+#[cfg_attr(feature = "clap", derive(clap::Args))]
 pub struct Opts {
     // ...
 }

crates/gen-guest-c/src/lib.rs

@@ -12,7 +12,7 @@ doctest = false
 wit-bindgen-core = { workspace = true }
 wit-bindgen-gen-rust-lib = { workspace = true }
 heck = { workspace = true }
-structopt = { workspace = true, optional = true }
+clap = { workspace = true, optional = true }
 
 [dev-dependencies]
 wit-bindgen-guest-rust = { path = '../guest-rust' }

crates/gen-guest-rust/Cargo.toml

@@ -24,24 +24,24 @@ pub struct RustWasm {
 }
 
 #[derive(Default, Debug, Clone)]
-#[cfg_attr(feature = "structopt", derive(structopt::StructOpt))]
+#[cfg_attr(feature = "clap", derive(clap::Args))]
 pub struct Opts {
     /// Whether or not `rustfmt` is executed to format generated code.
-    #[cfg_attr(feature = "structopt", structopt(long))]
+    #[cfg_attr(feature = "clap", arg(long))]
     pub rustfmt: bool,
 
     /// Adds the wit module name into import binding names when enabled.
-    #[cfg_attr(feature = "structopt", structopt(long))]
+    #[cfg_attr(feature = "clap", arg(long))]
     pub multi_module: bool,
 
     /// Whether or not the bindings assume interface values are always
     /// well-formed or whether checks are performed.
-    #[cfg_attr(feature = "structopt", structopt(long))]
+    #[cfg_attr(feature = "clap", arg(long))]
     pub unchecked: bool,
 
     /// A prefix to prepend to all exported symbols. Note that this is only
     /// intended for testing because it breaks the general form of the ABI.
-    #[cfg_attr(feature = "structopt", structopt(skip))]
+    #[cfg_attr(feature = "clap", arg(skip))]
     pub symbol_namespace: String,
 
     /// If true, the code generation is intended for standalone crates.
@@ -51,7 +51,7 @@ pub struct Opts {
     /// For exported interfaces, an `export!` macro is also generated
     /// that can be used to export an implementation from a different
     /// crate.
-    #[cfg_attr(feature = "structopt", structopt(skip))]
+    #[cfg_attr(feature = "clap", arg(skip))]
     pub standalone: bool,
 }
 

crates/gen-guest-rust/src/lib.rs

@@ -6,7 +6,7 @@ edition.workspace = true
 [dependencies]
 wit-bindgen-core = { workspace = true }
 heck = { version = "0.4", features = [ "unicode" ] }
-structopt = { workspace = true, optional = true }
+clap = { workspace = true, optional = true }
 
 [dev-dependencies]
 test-helpers = { path = '../test-helpers', default-features = false, features = ['guest-teavm-java'] }

crates/gen-guest-teavm-java/Cargo.toml

@@ -24,10 +24,10 @@ pub struct TeaVmJava {
 }
 
 #[derive(Default, Debug, Clone)]
-#[cfg_attr(feature = "structopt", derive(structopt::StructOpt))]
+#[cfg_attr(feature = "clap", derive(clap::Args))]
 pub struct Opts {
     /// Whether or not to generate a stub class for exported functions
-    #[cfg_attr(feature = "structopt", structopt(long))]
+    #[cfg_attr(feature = "clap", arg(long))]
     pub generate_stub: bool,
 }
 

crates/gen-guest-teavm-java/src/lib.rs

@@ -11,7 +11,7 @@ test = false
 [dependencies]
 wit-bindgen-core = { workspace = true }
 heck = { workspace = true }
-structopt = { workspace = true, optional = true }
+clap = { workspace = true, optional = true }
 
 [dev-dependencies]
 test-helpers = { path = '../test-helpers', features = ['host-js'] }

crates/gen-host-js/Cargo.toml

@@ -37,9 +37,9 @@ struct Exports {
 }
 
 #[derive(Default, Debug, Clone)]
-#[cfg_attr(feature = "structopt", derive(structopt::StructOpt))]
+#[cfg_attr(feature = "clap", derive(clap::Args))]
 pub struct Opts {
-    #[cfg_attr(feature = "structopt", structopt(long = "no-typescript"))]
+    #[cfg_attr(feature = "clap", arg(long = "no-typescript"))]
     pub no_typescript: bool,
 }