chore(deps): bump ratatui to 0.26.2 and crossterm to 0.27.0
Bumps MSRV to 1.74.0
This necessitated 3 changes to the codebase:
Spanswas renamed to the more ergonomicLinetype.Frameno longer requires a backend type parameter.Table::newrequires a widths parameter, so we useTable::default().rows(rows)instead ofTable::new(rows).
Crossterm on Windows triggers events for key press as well as release and repeat, which causes duplicate key presses. This change filters out those events.
It looks like this change requires a MSRV bump, as the new ratatui seems not to support Rust 1.64.0: https://github.com/tokio-rs/console/actions/runs/7763271246/job/21175134601#step:8:1
It looks like this change requires a MSRV bump, as the new
ratatuiseems not to support Rust 1.64.0: https://github.com/tokio-rs/console/actions/runs/7763271246/job/21175134601#step:8:1
Thanks - bumped this to 1.70
@joshka mind rebasing this branch onto the latest master and resolving the lockfile conflicts? Once that's done, this should be good to merge!
1:31 PM]joshka: I notice that some tests are failing now - digging to check what's happening
[1:31 PM]Hayden (he/him): if it's the self wakes test then it's known flaky.
[1:31 PM]Hayden (he/him): (I need to remove it)
[1:37 PM]joshka: Ah got it - yep it was that. I did't a quick cargo update on main and saw the tests fail there too (it didn't fail before then)
Squashed and rebased
There are some proto changes:
/// Each `ResourceUpdate` contains any resource data that has changed since the last
diff --git a/console-api/src/generated/rs.tokio.console.tasks.rs b/console-api/src/generated/rs.tokio.console.tasks.rs
index 41b8396..e8ee5fa 100644
--- a/console-api/src/generated/rs.tokio.console.tasks.rs
+++ b/console-api/src/generated/rs.tokio.console.tasks.rs
@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
/// A task state update.
///
/// Each `TaskUpdate` contains any task data that has changed since the last
diff --git a/console-api/src/generated/rs.tokio.console.trace.rs b/console-api/src/generated/rs.tokio.console.trace.rs
index [220](https://github.com/tokio-rs/console/actions/runs/8603263859/job/23574759021?pr=515#step:6:221)b55a..be3516e 100644
--- a/console-api/src/generated/rs.tokio.console.trace.rs
+++ b/console-api/src/generated/rs.tokio.console.trace.rs
@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
/// Start watching trace events with the provided filter.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
test bootstrap ... FAILED
Because there are some other issues in this PR, I would recommend:
- This PR only focuses on bumping the rataui version.
- If the rataui requires a higher MSRV, we bump the MSRV but do not change other dependencies' versions.
Perhaps we could address the issue of the failed test that was caused by changes in other dependencies.
Also, this would help us make sure the scope of this PR is not extended. We can only focus on bumping the rataui version.
Thank you for your patch again!
I've fixed the PR to just focus on the Ratatui changes (and bumped it to 0.26.2 which was released after this PR was created). I've also bumped crossterm to 0.27.0 to avoid incompatible versions, and fixed a small bug which hits most crossterm based apps on Windows (duplicate key presses).
I've bumped all the projects to MSRV 1.74 as this is the version that we build with in Ratatui. I'm not sure if it was right to just bump the tokio-console project or all the files, but this seems to be the least likely to cause CI pain (e.g. building the libs with 1.64 and the tui app with 1.74).
Lint CI fixed in https://github.com/tokio-rs/console/pull/548
@joshka There are some unused imports after your change. Could you please help to remove them? Thanks!
@joshka There are some unused imports after your change. Could you please help to remove them? Thanks!
Done
@hawkw Could you please rereview and approve (if you're happy with it) this PR? Your request for changes is blocking at the moment. Thanks!