tui -> ratatui

tui is not maintained anymore and it seems that ratatui is the successor: https://github.com/fdehau/tui-rs/issues/654

7 files changed, 20 insertions, 19 deletions

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 4b1db6eb..3bff9e46 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -6,13 +6,13 @@ pub mod style;
 mod syntax_text;
 
 use filetreelist::MoveSelection;
+use ratatui::layout::{Constraint, Direction, Layout, Rect};
 pub use scrollbar::{draw_scrollbar, Orientation};
 pub use scrolllist::{draw_list, draw_list_block};
 pub use stateful_paragraph::{
 	ParagraphState, ScrollPos, StatefulParagraph,
 };
 pub use syntax_text::{AsyncSyntaxJob, SyntaxText};
-use tui::layout::{Constraint, Direction, Layout, Rect};
 
 use crate::keys::{key_match, SharedKeyConfig};
 
@@ -157,7 +157,7 @@ pub fn common_nav(
 mod test {
 	use super::{rect_inside, Size};
 	use pretty_assertions::assert_eq;
-	use tui::layout::Rect;
+	use ratatui::layout::Rect;
 
 	#[test]
 	fn test_small_rect_in_rect() {
diff --git a/src/ui/reflow.rs b/src/ui/reflow.rs
index 81de4b84..028d9b21 100644
--- a/src/ui/reflow.rs
+++ b/src/ui/reflow.rs
@@ -1,6 +1,6 @@
 use crate::string_utils::trim_offset;
 use easy_cast::Cast;
-use tui::text::StyledGrapheme;
+use ratatui::text::StyledGrapheme;
 use unicode_width::UnicodeWidthStr;
 
 const NBSP: &str = "\u{00a0}";
diff --git a/src/ui/scrollbar.rs b/src/ui/scrollbar.rs
index 3a28fe82..f2e710d2 100644
--- a/src/ui/scrollbar.rs
+++ b/src/ui/scrollbar.rs
@@ -1,7 +1,6 @@
 use super::style::SharedTheme;
 use easy_cast::CastFloat;
-use std::convert::TryFrom;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	buffer::Buffer,
 	layout::{Margin, Rect},
@@ -13,6 +12,7 @@ use tui::{
 	widgets::Widget,
 	Frame,
 };
+use std::convert::TryFrom;
 
 pub enum Orientation {
 	Vertical,
diff --git a/src/ui/scrolllist.rs b/src/ui/scrolllist.rs
index b2af2d64..6fdc4ed8 100644
--- a/src/ui/scrolllist.rs
+++ b/src/ui/scrolllist.rs
@@ -1,6 +1,5 @@
 use super::style::SharedTheme;
-use std::iter::Iterator;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	buffer::Buffer,
 	layout::Rect,
@@ -9,6 +8,7 @@ use tui::{
 	widgets::{Block, Borders, List, ListItem, Widget},
 	Frame,
 };
+use std::iter::Iterator;
 
 ///
 struct ScrollableList<'b, L, S>
diff --git a/src/ui/stateful_paragraph.rs b/src/ui/stateful_paragraph.rs
index 40f52f65..ea4f0180 100644
--- a/src/ui/stateful_paragraph.rs
+++ b/src/ui/stateful_paragraph.rs
@@ -1,12 +1,12 @@
 use easy_cast::Cast;
-use std::iter;
-use tui::{
+use ratatui::{
 	buffer::Buffer,
 	layout::{Alignment, Rect},
 	style::Style,
 	text::{StyledGrapheme, Text},
 	widgets::{Block, StatefulWidget, Widget, Wrap},
 };
+use std::iter;
 use unicode_width::UnicodeWidthStr;
 
 use super::reflow::{LineComposer, LineTruncator, WordWrapper};
diff --git a/src/ui/style.rs b/src/ui/style.rs
index 8fca7e77..fe6c3cd8 100644
--- a/src/ui/style.rs
+++ b/src/ui/style.rs
@@ -1,5 +1,6 @@
 use anyhow::Result;
 use asyncgit::{DiffLineType, StatusItemType};
+use ratatui::style::{Color, Modifier, Style};
 use ron::{
 	de::from_bytes,
 	ser::{to_string_pretty, PrettyConfig},
@@ -11,7 +12,6 @@ use std::{
 	path::PathBuf,
 	rc::Rc,
 };
-use tui::style::{Color, Modifier, Style};
 
 pub type SharedTheme = Rc<Theme>;
 
diff --git a/src/ui/syntax_text.rs b/src/ui/syntax_text.rs
index 2e7de2d1..7a90be1c 100644
--- a/src/ui/syntax_text.rs
+++ b/src/ui/syntax_text.rs
@@ -3,6 +3,7 @@ use asyncgit::{
 	ProgressPercent,
 };
 use once_cell::sync::Lazy;
+use ratatui::text::{Span, Spans};
 use scopetime::scope_time;
 use std::{
 	ffi::OsStr,
@@ -18,7 +19,6 @@ use syntect::{
 	},
 	parsing::{ParseState, ScopeStack, SyntaxSet},
 };
-use tui::text::{Span, Spans};
 
 use crate::{AsyncAppNotification, SyntaxHighlightProgress};
 
@@ -162,7 +162,7 @@ impl SyntaxText {
 	}
 }
 
-impl<'a> From<&'a SyntaxText> for tui::text::Text<'a> {
+impl<'a> From<&'a SyntaxText> for ratatui::text::Text<'a> {
 	fn from(v: &'a SyntaxText) -> Self {
 		let mut result_lines: Vec<Spans> =
 			Vec::with_capacity(v.lines.len());
@@ -189,22 +189,23 @@ impl<'a> From<&'a SyntaxText> for tui::text::Text<'a> {
 	}
 }
 
-fn syntact_style_to_tui(style: &Style) -> tui::style::Style {
-	let mut res =
-		tui::style::Style::default().fg(tui::style::Color::Rgb(
+fn syntact_style_to_tui(style: &Style) -> ratatui::style::Style {
+	let mut res = ratatui::style::Style::default().fg(
+		ratatui::style::Color::Rgb(
 			style.foreground.r,
 			style.foreground.g,
 			style.foreground.b,
-		));
+		),
+	);
 
 	if style.font_style.contains(FontStyle::BOLD) {
-		res = res.add_modifier(tui::style::Modifier::BOLD);
+		res = res.add_modifier(ratatui::style::Modifier::BOLD);
 	}
 	if style.font_style.contains(FontStyle::ITALIC) {
-		res = res.add_modifier(tui::style::Modifier::ITALIC);
+		res = res.add_modifier(ratatui::style::Modifier::ITALIC);
 	}
 	if style.font_style.contains(FontStyle::UNDERLINE) {
-		res = res.add_modifier(tui::style::Modifier::UNDERLINED);
+		res = res.add_modifier(ratatui::style::Modifier::UNDERLINED);
 	}
 
 	res