diff --git a/Cargo.lock b/Cargo.lock index e934616..cbbd2d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,17 +98,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -608,14 +597,9 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags 1.3.2", - "clap_derive 3.2.25", "clap_lex 0.2.4", "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", "textwrap", ] @@ -626,7 +610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", - "clap_derive 4.5.18", + "clap_derive", ] [[package]] @@ -638,25 +622,12 @@ dependencies = [ "anstream", "anstyle", "clap_lex 0.7.4", - "strsim 0.11.1", + "strsim", "terminal_size", "unicase", "unicode-width", ] -[[package]] -name = "clap_derive" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "clap_derive" version = "4.5.18" @@ -840,7 +811,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.90", ] @@ -1268,15 +1239,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hex" version = "0.4.3" @@ -2012,30 +1974,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2207,7 +2145,7 @@ version = "0.1.0" name = "runner" version = "0.1.0" dependencies = [ - "clap 3.2.25", + "clap 4.5.23", "elf 0.0.10", "libc", "termion", @@ -2448,12 +2386,6 @@ dependencies = [ "der", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -2528,15 +2460,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "terminal_size" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index bf98044..d75ff14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ authors = ["Caliptra contributors"] arrayref = "0.3.6" bitfield = "0.14.0" bit-vec = "0.6.3" -clap = { version = "4.5.11", features = [ +clap = { version = "4.5.23", features = [ "cargo", "derive", "env", diff --git a/runtime/apps/libtock/runner/Cargo.toml b/runtime/apps/libtock/runner/Cargo.toml index 729c350..1ed728f 100644 --- a/runtime/apps/libtock/runner/Cargo.toml +++ b/runtime/apps/libtock/runner/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://www.github.com/tock/libtock-rs" version = "0.1.0" [dependencies] -clap = { features = ["derive"], version = "3.2.6" } +clap.workspace = true elf = "0.0.10" libc = "0.2.113" termion = "1.5.6"