Bump various dependencies (#643)

* Bump tower to 0.5.2 and tower-http to 0.6.6

* Bump crossterm to 0.29

* Bump dirs to 6

* Bump ratatui to 0.29

* Bump tracing-journald to 0.3

* Bump compatible cargo deps

* Bump toml to 0.9.7

* Bump minimal tokio version to the latest LTS

At the time of writing this is 1.47.1

Author: ipetkov

Cargo.lock

@@ -33,7 +33,7 @@ vsock = ["dep:tokio-vsock"]
 
 [dependencies]
 crossbeam-utils = "0.8.7"
-tokio = { version = "1.34", features = ["sync", "time", "macros", "tracing"] }
+tokio = { version = "1.47.1", features = ["sync", "time", "macros", "tracing"] }
 tokio-stream = { version = "0.1.16", features = ["net"] }
 thread_local = "1.1.4"
 console-api = { version = "0.8.0", path = "../console-api", features = ["transport"] }
@@ -58,11 +58,11 @@ crossbeam-channel = "0.5"
 tokio-vsock = { version = "0.7.2", optional = true, features = ["tonic014"]}
 
 [dev-dependencies]
-tokio = { version = "1.34", features = ["full", "rt-multi-thread"] }
-tower = { version = "0.4.12", default-features = false, features = ["util"] }
+tokio = { version = "1.47.1", features = ["full", "rt-multi-thread"] }
+tower = { version = "0.5.2", default-features = false, features = ["util"] }
 futures = "0.3"
 http = "1.1"
-tower-http = { version = "0.5", features = ["cors"] }
+tower-http = { version = "0.6.6", features = ["cors"] }
 tonic-web = "0.14.2"
 
 [lints.rust.unexpected_cfgs]

console-subscriber/Cargo.toml

@@ -36,16 +36,16 @@ eula = false
 console-api = { version = "0.8.1", path = "../console-api", features = ["transport"] }
 clap = { version = "~4.5.4", features = ["wrap_help", "cargo", "derive", "env"] }
 clap_complete = "~4.5.2"
-tokio = { version = "1.34", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.47.1", features = ["full", "rt-multi-thread"] }
 tonic = { version = "0.14.2", features = ["transport"] }
 futures = "0.3"
-ratatui = { version = "0.26.2", default-features = false, features = ["crossterm"] }
-tower = { version = "0.4.12", features = ["util"] }
+ratatui = { version = "0.29.0", default-features = false, features = ["crossterm"] }
+tower = { version = "0.5.2", features = ["util"] }
 tracing = "0.1.35"
 tracing-subscriber = { version = "0.3.17" }
-tracing-journald = { version = "0.2", optional = true }
+tracing-journald = { version = "0.3", optional = true }
 prost-types = "0.14.1"
-crossterm = { version = "0.27.0", features = ["event-stream"] }
+crossterm = { version = "0.29.0", features = ["event-stream"] }
 color-eyre = { version = "0.6", features = ["issue-url"] }
 hdrhistogram = { version = "7.4.0", default-features = false, features = ["serialization"] }
 # Keep this in sync with the version from `tonic`.
@@ -57,8 +57,8 @@ once_cell = "1.17.1"
 cfg-if = "1.0.0"
 humantime = "2.1.0"
 serde = { version = "1.0.145", features = ["derive"] }
-toml = "0.5"
-dirs = "5"
+toml = "0.9"
+dirs = "6"
 hyper-util = { version = "0.1.6", features = ["tokio"] }
 tokio-vsock = { version = "0.7.2", features = ["tonic014"], optional = true }
 

tokio-console/Cargo.toml

@@ -1,23 +1,23 @@
-default_target_addr = 'http://127.0.0.1:6669/'
-log = 'off'
+default_target_addr = "http://127.0.0.1:6669/"
+log = "off"
 warnings = [
-    'self-wakes',
-    'lost-waker',
-    'never-yielded',
-    'auto-boxed-future',
-    'large-future',
+    "self-wakes",
+    "lost-waker",
+    "never-yielded",
+    "auto-boxed-future",
+    "large-future",
 ]
-log_directory = '/tmp/tokio-console/logs'
-retention = '6s'
+log_directory = "/tmp/tokio-console/logs"
+retention = "6s"
 
 [charset]
-lang = 'en_US.UTF-8'
+lang = "en_US.UTF-8"
 ascii_only = false
 
 [colors]
 enabled = true
 truecolor = true
-palette = 'all'
+palette = "all"
 
 [colors.enable]
 durations = true

tokio-console/console.example.toml

@@ -152,7 +152,7 @@ async fn main() -> color_eyre::Result<()> {
                     ]
                     .as_ref(),
                 )
-                .split(f.size());
+                .split(f.area());
 
             let mut header_text = conn.render(&view.styles);
             match state.temporality() {

tokio-console/src/main.rs

@@ -59,7 +59,7 @@ impl TableList<9> for AsyncOpsTable {
     fn render(
         table_list_state: &mut TableListState<Self, 9>,
         styles: &view::Styles,
-        frame: &mut ratatui::terminal::Frame,
+        frame: &mut ratatui::Frame,
         area: layout::Rect,
         state: &mut State,
         ctx: Self::Context,
@@ -212,7 +212,7 @@ impl TableList<9> for AsyncOpsTable {
             .block(block)
             .widths(widths)
             .highlight_symbol(view::TABLE_HIGHLIGHT_SYMBOL)
-            .highlight_style(Style::default().add_modifier(style::Modifier::BOLD));
+            .row_highlight_style(Style::default().add_modifier(style::Modifier::BOLD));
 
         frame.render_stateful_widget(table, area, &mut table_list_state.table_state);
 

tokio-console/src/view/async_ops.rs

@@ -24,11 +24,11 @@ impl<'a> HelpView<'a> {
     pub(crate) fn render(
         &mut self,
         styles: &view::Styles,
-        frame: &mut ratatui::terminal::Frame,
+        frame: &mut ratatui::Frame,
         _area: layout::Rect,
         _state: &mut State,
     ) {
-        let r = frame.size();
+        let r = frame.area();
         let content = self
             .help_text
             .take()

tokio-console/src/view/help.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use ratatui::{
-    layout::Rect,
+    layout::{Position, Rect},
     style::Style,
     symbols,
     widgets::{Block, Widget},
@@ -165,9 +165,13 @@ impl<'a> MiniHistogram<'a> {
                     7 => self.bar_set.seven_eighths,
                     _ => self.bar_set.full,
                 };
-                buf.get_mut(area.left() + i as u16, area.top() + j)
-                    .set_symbol(symbol)
-                    .set_style(self.style);
+
+                if let Some(cell) = buf.cell_mut(Position {
+                    x: area.left() + i as u16,
+                    y: area.top() + j,
+                }) {
+                    cell.set_symbol(symbol).set_style(self.style);
+                }
 
                 if *d > 8 {
                     *d -= 8;

tokio-console/src/view/mini_histogram.rs

@@ -219,7 +219,7 @@ impl View {
 
     pub(crate) fn render(
         &mut self,
-        frame: &mut ratatui::terminal::Frame,
+        frame: &mut ratatui::Frame,
         area: layout::Rect,
         state: &mut State,
     ) {

tokio-console/src/view/mod.rs

@@ -41,7 +41,7 @@ impl ResourceView {
     pub(crate) fn render(
         &mut self,
         styles: &view::Styles,
-        frame: &mut ratatui::terminal::Frame,
+        frame: &mut ratatui::Frame,
         area: layout::Rect,
         state: &mut State,
     ) {