From 28aa79eaf7c1026d531d17aa7026d269b627ba50 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Tue, 13 Aug 2024 17:02:34 -0400 Subject: [PATCH] (chore) Bump ratatui, textarea and crossterm version in lock-step. (#310) --- Cargo.lock | 60 ++++++++++++++++++------------------------ Cargo.toml | 6 ++--- src/registry/search.rs | 4 +-- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2417e739..7463f33a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -464,13 +464,14 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "compact_str" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" dependencies = [ "castaway", "cfg-if", "itoa", + "rustversion", "ryu", "serde", "static_assertions", @@ -618,15 +619,15 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.6.0", "crossterm_winapi", - "libc", - "mio 0.8.11", + "mio", "parking_lot", + "rustix", "serde", "signal-hook", "signal-hook-mio", @@ -1986,6 +1987,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instability" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "io-close" version = "0.3.7" @@ -2391,18 +2402,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.1" @@ -2411,6 +2410,7 @@ checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ "hermit-abi", "libc", + "log", "wasi", "windows-sys 0.52.0", ] @@ -2957,19 +2957,19 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" +checksum = "5ba6a365afbe5615999275bea2446b970b10a41102500e27ce7678d50d978303" dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", "crossterm", + "instability", "itertools 0.13.0", "lru", "paste", "serde", - "stability", "strum", "strum_macros", "unicode-segmentation", @@ -3438,7 +3438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", + "mio", "signal-hook", ] @@ -3518,16 +3518,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "stability" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -3765,7 +3755,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio", "pin-project-lite", "socket2", "windows-sys 0.52.0", @@ -3883,9 +3873,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tui-textarea" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00524c1366ee838839dd327d1f339ff51846ad4ea85bfa1332859e79adec612c" +checksum = "29c07084342a575cea919eea996b9658a358c800b03d435df581c1d7c60e065a" dependencies = [ "crossterm", "ratatui", diff --git a/Cargo.toml b/Cargo.toml index a068e42b..b33e6cd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,9 +80,9 @@ weaver_checker = { path = "crates/weaver_checker" } clap = { version = "4.5.14", features = ["derive"] } rayon = "1.10.0" -ratatui = { version = "0.27.0", features=["serde"] } -crossterm = { version = "0.27.0", features = ["serde"] } -tui-textarea = "0.5.1" +ratatui = { version = "0.28.0", features=["serde"] } +crossterm = { version = "0.28.1", features = ["serde"] } +tui-textarea = "0.6.1" # workspace dependencies serde.workspace = true diff --git a/src/registry/search.rs b/src/registry/search.rs index c948bd87..066fd6e0 100644 --- a/src/registry/search.rs +++ b/src/registry/search.rs @@ -270,7 +270,7 @@ impl<'a> SearchApp<'a> { Constraint::Min(1), Constraint::Length(3), ]) - .split(frame.size()); + .split(frame.area()); frame.render_widget(self.title(), chunks[0]); // Render search reuslts. @@ -290,7 +290,7 @@ impl<'a> SearchApp<'a> { } // Render the footer. - frame.render_widget(self.footer().widget(), chunks[2]); + frame.render_widget(self.footer(), chunks[2]); } // Processes events that will change the state of the UI.