summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Genannt <tobias.genannt@gmail.com>2023-10-28 14:30:02 +0200
committerGitHub <noreply@github.com>2023-10-28 13:30:02 +0100
commit206677878039fafeb2b7ee9847ef0c8632db91d0 (patch)
tree771de41e56921748d92a925b51081b27e00c7d40
parentfa7caf430a063e42bb7ff05464fc04a3f6b5b0d6 (diff)
Fix for breaking change in ratatui 0.24.0 (#1352)
-rw-r--r--Cargo.lock14
-rw-r--r--atuin/Cargo.toml2
-rw-r--r--atuin/src/command/client/search/interactive.rs4
3 files changed, 15 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e59bae3f..e7b0c2cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1692,6 +1692,15 @@ dependencies = [
]
[[package]]
+name = "lru"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60"
+dependencies = [
+ "hashbrown 0.14.2",
+]
+
+[[package]]
name = "malloc_buf"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2289,15 +2298,16 @@ dependencies = [
[[package]]
name = "ratatui"
-version = "0.23.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad"
+checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425"
dependencies = [
"bitflags 2.4.1",
"cassowary",
"crossterm",
"indoc",
"itertools",
+ "lru",
"paste",
"strum",
"unicode-segmentation",
diff --git a/atuin/Cargo.toml b/atuin/Cargo.toml
index 9b4aa391..23683cca 100644
--- a/atuin/Cargo.toml
+++ b/atuin/Cargo.toml
@@ -70,7 +70,7 @@ tiny-bip39 = "1"
futures-util = "0.3"
fuzzy-matcher = "0.3.7"
colored = "2.0.4"
-ratatui = "0.23"
+ratatui = "0.24"
tracing = "0.1"
cli-clipboard = "0.4.0"
diff --git a/atuin/src/command/client/search/interactive.rs b/atuin/src/command/client/search/interactive.rs
index 25fd6bc0..da6d9cbd 100644
--- a/atuin/src/command/client/search/interactive.rs
+++ b/atuin/src/command/client/search/interactive.rs
@@ -29,7 +29,7 @@ use super::{
};
use crate::{command::client::search::engines, VERSION};
use ratatui::{
- backend::{Backend, CrosstermBackend},
+ backend::CrosstermBackend,
layout::{Alignment, Constraint, Direction, Layout},
style::{Color, Modifier, Style},
text::{Line, Span, Text},
@@ -312,7 +312,7 @@ impl State {
#[allow(clippy::cast_possible_truncation)]
#[allow(clippy::bool_to_int_with_if)]
- fn draw<T: Backend>(&mut self, f: &mut Frame<'_, T>, results: &[History], settings: &Settings) {
+ fn draw(&mut self, f: &mut Frame, results: &[History], settings: &Settings) {
let compact = match settings.style {
atuin_client::settings::Style::Auto => f.size().height < 14,
atuin_client::settings::Style::Compact => true,