diff --git a/Cargo.lock b/Cargo.lock index 0c2c411d0..796a749a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayref" @@ -334,7 +334,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -369,7 +369,7 @@ checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -578,7 +578,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -741,14 +741,14 @@ dependencies = [ "anstyle", "clap_lex 0.6.0", "strsim", - "terminal_size", + "terminal_size 0.3.0", ] [[package]] name = "clap_complete" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a51919c5608a32e34ea1d6be321ad070065e17613e168c5b6977024290f2630b" +checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" dependencies = [ "clap 4.4.12", ] @@ -772,7 +772,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -920,6 +920,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "colorgrad" version = "0.6.2" @@ -1305,7 +1315,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -1316,7 +1326,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -1538,7 +1548,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -1865,7 +1875,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -2000,7 +2010,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -2789,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32ddb58b0079a063218472916af599f2753ccb40942cdaba9d1f3fefccef17a9" dependencies = [ "anyhow", - "colored", + "colored 1.9.4", "diff", "lazy_static", "libc", @@ -2799,6 +2809,23 @@ dependencies = [ "term_size", ] +[[package]] +name = "k9" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088bcebb5b68b1b14b64d7f05b0f802719250b97fdc0338ec42529ea777ed614" +dependencies = [ + "anyhow", + "colored 2.1.0", + "diff", + "lazy_static", + "libc", + "proc-macro2", + "regex", + "syn 2.0.46", + "terminal_size 0.2.6", +] + [[package]] name = "khronos-egl" version = "6.0.0" @@ -2874,7 +2901,7 @@ dependencies = [ "config", "fnv", "intrusive-collections", - "k9", + "k9 0.11.6", "metrics", ] @@ -3372,7 +3399,7 @@ dependencies = [ "finl_unicode", "flume 0.10.14", "hostname", - "k9", + "k9 0.11.6", "lazy_static", "libc", "log", @@ -3757,7 +3784,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -3921,7 +3948,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -3975,7 +4002,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -4004,7 +4031,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -4218,9 +4245,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] @@ -4315,9 +4342,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4592,7 +4619,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.44", + "syn 2.0.46", "unicode-ident", ] @@ -4750,9 +4777,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] @@ -4769,20 +4796,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" dependencies = [ "itoa", "ryu", @@ -4797,7 +4824,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -4846,7 +4873,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -5242,9 +5269,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.44" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d27c2c202598d05175a6dd3af46824b7f747f8d8e9b14c623f19fa5069735d" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ "proc-macro2", "quote", @@ -5363,6 +5390,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.27", + "windows-sys 0.48.0", +] + [[package]] name = "terminal_size" version = "0.3.0" @@ -5427,7 +5464,7 @@ dependencies = [ "fnv", "hex", "image", - "k9", + "k9 0.11.6", "lazy_static", "libc", "log", @@ -5497,22 +5534,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cd5904763bad08ad5513ddbb12cf2ae273ca53fa9f68e843e236ec6dfccc09" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -5662,7 +5699,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -5768,7 +5805,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] @@ -5980,7 +6017,7 @@ dependencies = [ name = "vtparse" version = "0.6.2" dependencies = [ - "k9", + "k9 0.11.6", "utf8parse", ] @@ -6036,7 +6073,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", "wasm-bindgen-shared", ] @@ -6070,7 +6107,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6224,7 +6261,7 @@ name = "wezterm-bidi" version = "0.2.2" dependencies = [ "env_logger", - "k9", + "k9 0.12.0", "log", "wezterm-dynamic", ] @@ -6340,7 +6377,7 @@ dependencies = [ "freetype", "harfbuzz", "image", - "k9", + "k9 0.11.6", "lazy_static", "lfucache", "log", @@ -6391,7 +6428,7 @@ dependencies = [ "hdrhistogram", "http_req", "image", - "k9", + "k9 0.12.0", "lazy_static", "lfucache", "libc", @@ -6545,7 +6582,7 @@ dependencies = [ "filedescriptor", "filenamegen", "gethostname", - "k9", + "k9 0.12.0", "libc", "libssh-rs", "log", @@ -6577,7 +6614,7 @@ dependencies = [ "hex", "humansize", "image", - "k9", + "k9 0.11.6", "lazy_static", "log", "lru", @@ -6806,7 +6843,7 @@ dependencies = [ "gl_generator", "glium", "guillotiere", - "k9", + "k9 0.11.6", "lazy_static", "libc", "libloading 0.6.7", @@ -7340,7 +7377,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.44", + "syn 2.0.46", ] [[package]] diff --git a/bidi/Cargo.toml b/bidi/Cargo.toml index e2cecc963..3a4966dc4 100644 --- a/bidi/Cargo.toml +++ b/bidi/Cargo.toml @@ -16,5 +16,5 @@ log = "0.4" wezterm-dynamic = { version = "0.1", path = "../wezterm-dynamic" } [dev-dependencies] -k9 = "0.11.0" +k9 = "0.12.0" env_logger = "0.10" diff --git a/wezterm-gui/Cargo.toml b/wezterm-gui/Cargo.toml index 75997ff5c..e9a54650b 100644 --- a/wezterm-gui/Cargo.toml +++ b/wezterm-gui/Cargo.toml @@ -126,6 +126,6 @@ windows = { version="0.33.0", features = [ ]} [dev-dependencies] -k9 = "0.11.0" +k9 = "0.12.0" env_logger = "0.10" benchmarking = "0.4" diff --git a/wezterm-ssh/Cargo.toml b/wezterm-ssh/Cargo.toml index 646a4ff93..c4a164aa9 100644 --- a/wezterm-ssh/Cargo.toml +++ b/wezterm-ssh/Cargo.toml @@ -42,7 +42,7 @@ async_ossl = { path = "../async_ossl" } [dev-dependencies] assert_fs = "1.0.4" clap = {version="4.0", features=["derive"]} -k9 = "0.11.0" +k9 = "0.12.0" once_cell = "1.8" predicates = "3.0" env_logger = "0.10" diff --git a/wezterm/Cargo.toml b/wezterm/Cargo.toml index 9dc71adcc..27e608fdb 100644 --- a/wezterm/Cargo.toml +++ b/wezterm/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" anyhow = "1.0" chrono = {version="0.4", default-features=false} clap = {version="4.0", features=["derive", "wrap_help"]} -clap_complete = "4.0" +clap_complete = "4.4" clap_complete_fig = "4.0" codec = { path = "../codec" } config = { path = "../config" }