From 777705b902bd58637ec7023cc7b2e14ad326de96 Mon Sep 17 00:00:00 2001 From: itsjunetime Date: Wed, 6 Aug 2025 09:21:56 -0600 Subject: [PATCH] Update ratatui deps --- Cargo.lock | 109 +++++++++++++++++++++++++++----------------------- Cargo.toml | 2 +- ratatui | 2 +- ratatui-image | 2 +- 4 files changed, 61 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22699b2..2626049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.30" +version = "1.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" dependencies = [ "jobserver", "libc", @@ -426,18 +426,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.41" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" +checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.41" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" +checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" dependencies = [ "anstyle", "clap_lex", @@ -1573,7 +1573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.2", + "windows-targets 0.53.3", ] [[package]] @@ -1588,9 +1588,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" dependencies = [ "bitflags 2.9.1", "libc", @@ -1619,9 +1619,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litrs" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "lock_api" @@ -1650,9 +1650,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" +checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" dependencies = [ "hashbrown 0.15.4", ] @@ -1832,9 +1832,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "notify" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97" +checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ "bitflags 2.9.1", "crossbeam-channel", @@ -2344,8 +2344,8 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.30.0-alpha.4" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.30.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "instability", "ratatui-core", @@ -2357,8 +2357,8 @@ dependencies = [ [[package]] name = "ratatui-core" -version = "0.1.0-alpha.5" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.1.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "bitflags 2.9.1", "compact_str", @@ -2376,8 +2376,8 @@ dependencies = [ [[package]] name = "ratatui-crossterm" -version = "0.1.0-alpha.4" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.1.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "crossterm", "instability", @@ -2387,7 +2387,7 @@ dependencies = [ [[package]] name = "ratatui-image" version = "8.0.1" -source = "git+https://github.com/itsjunetime/ratatui-image.git?branch=vb64_on_personal#0039c2d470b0b070fb3b6d02d8a4e11fa277921e" +source = "git+https://github.com/itsjunetime/ratatui-image.git?branch=vb64_on_personal#375a9e190a66179915fde0a677245f2c4d3cbc92" dependencies = [ "base64 0.22.1", "icy_sixel", @@ -2401,8 +2401,8 @@ dependencies = [ [[package]] name = "ratatui-macros" -version = "0.7.0-alpha.3" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.7.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "ratatui-core", "ratatui-widgets", @@ -2410,8 +2410,8 @@ dependencies = [ [[package]] name = "ratatui-termwiz" -version = "0.1.0-alpha.4" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.1.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "ratatui-core", "termwiz", @@ -2419,8 +2419,8 @@ dependencies = [ [[package]] name = "ratatui-widgets" -version = "0.3.0-alpha.4" -source = "git+https://github.com/itsjunetime/ratatui.git#3668e6a069966e4379a68533163d123b5cc81301" +version = "0.3.0-beta.0" +source = "git+https://github.com/itsjunetime/ratatui.git#47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc" dependencies = [ "bitflags 2.9.1", "hashbrown 0.15.4", @@ -2507,18 +2507,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags 2.9.1", ] [[package]] name = "redox_users" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", @@ -2577,9 +2577,9 @@ checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" [[package]] name = "rustc-demangle" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc-hash" @@ -2677,9 +2677,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.141" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "itoa", "memchr", @@ -2745,9 +2745,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] @@ -3063,9 +3063,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.46.1" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", @@ -3074,10 +3074,10 @@ dependencies = [ "mio", "pin-project-lite", "slab", - "socket2 0.5.10", + "socket2 0.6.0", "tokio-macros", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3104,9 +3104,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -3315,9 +3315,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" [[package]] name = "utf8parse" @@ -3630,6 +3630,12 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-result" version = "0.2.0" @@ -3673,7 +3679,7 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.3", ] [[package]] @@ -3694,10 +3700,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ + "windows-link", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -3885,9 +3892,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-jpeg" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9e525af0a6a658e031e95f14b7f889976b74a11ba0eca5a5fc9ac8a1c43a6a" +checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089" dependencies = [ "zune-core", ] diff --git a/Cargo.toml b/Cargo.toml index 878b45f..c2cbaa8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ name = "tdf" [dependencies] # we're using this branch because it has significant performance fixes that I'm waiting on responses from the upstream devs to get upstreamed. See https://github.com/ratatui-org/ratatui/issues/1116 ratatui = { git = "https://github.com/itsjunetime/ratatui.git" } -# ratatui = { path = "./ratatui/ratatui" } +# ratatui = { path = "./ratatui/ratatui/" } # We're using this to have the vb64 feature (for faster base64 encoding, since that does take up a good bit of time when converting images to the `Protocol`. It also just includes a few more features that I'm waiting on main to upstream ratatui-image = { git = "https://github.com/itsjunetime/ratatui-image.git", branch = "vb64_on_personal", default-features = false } # ratatui-image = { path = "./ratatui-image", default-features = false } diff --git a/ratatui b/ratatui index 3668e6a..47c200f 160000 --- a/ratatui +++ b/ratatui @@ -1 +1 @@ -Subproject commit 3668e6a069966e4379a68533163d123b5cc81301 +Subproject commit 47c200fb7f3ac1a2c8df24b553a0ae6d46706ebc diff --git a/ratatui-image b/ratatui-image index 0039c2d..375a9e1 160000 --- a/ratatui-image +++ b/ratatui-image @@ -1 +1 @@ -Subproject commit 0039c2d470b0b070fb3b6d02d8a4e11fa277921e +Subproject commit 375a9e190a66179915fde0a677245f2c4d3cbc92