tui -> ratatui

tui is not maintained anymore and it seems that ratatui is the successor: fdehau/tui-rs#654
extrawurst · Apr 19, 2023 · 904885e · 904885e
1 parent 19b820b
commit 904885e
Show file tree

Hide file tree

Showing 57 changed files with 161 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ bytesize = { version = "1.2", default-features = false }
 chrono = { version = "0.4", default-features = false, features = [ "clock" ] }
 clap = { version = "4.1", features = [ "env", "cargo" ] }
 crossbeam-channel = "0.5"
-crossterm = { version = "0.25", features = [ "serde" ] }
+crossterm = { version = "0.26.1", features = [ "serde" ] }
 dirs-next = "2.0"
 easy-cast = "0.5"
 filetreelist = { path = "./filetreelist", version = "0.5" }
@@ -40,6 +40,7 @@ log = "0.4"
 notify = "5.1"
 notify-debouncer-mini = "0.2" 
 once_cell = "1"
+ratatui = { version = "0.20", default-features = false, features = ['crossterm', 'serde'] }
 rayon-core = "1.11"
 ron = "0.8"
 scopeguard = "1.1"
@@ -49,7 +50,6 @@ simplelog = { version = "0.12", default-features = false }
 struct-patch = "0.2"
 syntect = { version = "5.0", default-features = false, features = ["parsing", "default-syntaxes", "default-themes", "html"] }
 textwrap = "0.16"
-tui = { version = "0.19", default-features = false, features = ['crossterm', 'serde'] }
 unicode-segmentation = "1.10"
 unicode-truncate = "0.2"
 unicode-width = "0.1"

diff --git a/src/app.rs b/src/app.rs
@@ -34,12 +34,7 @@ use asyncgit::{
 };
 use crossbeam_channel::Sender;
 use crossterm::event::{Event, KeyEvent};
-use std::{
-	cell::{Cell, RefCell},
-	path::Path,
-	rc::Rc,
-};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{
 		Alignment, Constraint, Direction, Layout, Margin, Rect,
@@ -48,6 +43,11 @@ use tui::{
 	widgets::{Block, Borders, Paragraph, Tabs},
 	Frame,
 };
+use std::{
+	cell::{Cell, RefCell},
+	path::Path,
+	rc::Rc,
+};
 use unicode_width::UnicodeWidthStr;
 
 #[derive(Clone)]

diff --git a/src/cmdbar.rs b/src/cmdbar.rs
@@ -2,14 +2,14 @@ use crate::{
 	components::CommandInfo, keys::SharedKeyConfig, strings,
 	ui::style::SharedTheme,
 };
-use std::borrow::Cow;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Alignment, Rect},
 	text::{Span, Spans},
 	widgets::Paragraph,
 	Frame,
 };
+use std::borrow::Cow;
 use unicode_width::UnicodeWidthStr;
 
 enum DrawListEntry {

diff --git a/src/components/blame_file.rs b/src/components/blame_file.rs
@@ -18,15 +18,15 @@ use asyncgit::{
 };
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
-use std::convert::TryInto;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Rect},
 	symbols::line::VERTICAL,
 	text::Span,
 	widgets::{Block, Borders, Cell, Clear, Row, Table, TableState},
 	Frame,
 };
+use std::convert::TryInto;
 
 static NO_COMMIT_ID: &str = "0000000";
 static NO_AUTHOR: &str = "<no author>";

diff --git a/src/components/branchlist.rs b/src/components/branchlist.rs
@@ -26,8 +26,7 @@ use asyncgit::{
 	AsyncGitNotification,
 };
 use crossterm::event::Event;
-use std::{cell::Cell, convert::TryInto};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{
 		Alignment, Constraint, Direction, Layout, Margin, Rect,
@@ -36,6 +35,7 @@ use tui::{
 	widgets::{Block, BorderType, Borders, Clear, Paragraph, Tabs},
 	Frame,
 };
+use std::{cell::Cell, convert::TryInto};
 use ui::style::SharedTheme;
 use unicode_truncate::UnicodeTruncateStr;
 

diff --git a/src/components/changes.rs b/src/components/changes.rs
@@ -17,8 +17,8 @@ use asyncgit::{
 	StatusItem, StatusItemType,
 };
 use crossterm::event::Event;
+use ratatui::{backend::Backend, layout::Rect, Frame};
 use std::path::Path;
-use tui::{backend::Backend, layout::Rect, Frame};
 
 ///
 pub struct ChangesComponent {

diff --git a/src/components/commit.rs b/src/components/commit.rs
@@ -21,16 +21,16 @@ use asyncgit::{
 };
 use crossterm::event::Event;
 use easy_cast::Cast;
-use std::{
-	fs::{read_to_string, File},
-	io::{Read, Write},
-};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Alignment, Rect},
 	widgets::Paragraph,
 	Frame,
 };
+use std::{
+	fs::{read_to_string, File},
+	io::{Read, Write},
+};
 
 enum CommitResult {
 	ComitDone,

diff --git a/src/components/commit_details/compare_details.rs b/src/components/commit_details/compare_details.rs
@@ -14,7 +14,7 @@ use crate::{
 use anyhow::Result;
 use asyncgit::sync::{self, CommitDetails, CommitId, RepoPathRef};
 use crossterm::event::Event;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Rect},
 	text::{Span, Spans, Text},

diff --git a/src/components/commit_details/details.rs b/src/components/commit_details/details.rs
@@ -15,16 +15,16 @@ use asyncgit::sync::{
 	self, CommitDetails, CommitId, CommitMessage, RepoPathRef, Tag,
 };
 use crossterm::event::Event;
-use std::clone::Clone;
-use std::{borrow::Cow, cell::Cell};
-use sync::CommitTags;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Rect},
 	style::{Modifier, Style},
 	text::{Span, Spans, Text},
 	Frame,
 };
+use std::clone::Clone;
+use std::{borrow::Cow, cell::Cell};
+use sync::CommitTags;
 
 use super::style::Detail;
 

diff --git a/src/components/commit_details/mod.rs b/src/components/commit_details/mod.rs
@@ -22,7 +22,7 @@ use compare_details::CompareDetailsComponent;
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
 use details::DetailsComponent;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Rect},
 	Frame,

diff --git a/src/components/commit_details/style.rs b/src/components/commit_details/style.rs
@@ -1,6 +1,6 @@
 use crate::{strings, ui::style::SharedTheme};
+use ratatui::text::Span;
 use std::borrow::Cow;
-use tui::text::Span;
 
 pub enum Detail {
 	Author,

diff --git a/src/components/commitlist.rs b/src/components/commitlist.rs
@@ -19,17 +19,17 @@ use asyncgit::sync::{
 use chrono::{DateTime, Local};
 use crossterm::event::Event;
 use itertools::Itertools;
-use std::{
-	borrow::Cow, cell::Cell, cmp, collections::BTreeMap,
-	convert::TryFrom, time::Instant,
-};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Alignment, Rect},
 	text::{Span, Spans},
 	widgets::{Block, Borders, Paragraph},
 	Frame,
 };
+use std::{
+	borrow::Cow, cell::Cell, cmp, collections::BTreeMap,
+	convert::TryFrom, time::Instant,
+};
 
 const ELEMENTS_PER_LINE: usize = 9;
 

diff --git a/src/components/compare_commits.rs b/src/components/compare_commits.rs
@@ -18,7 +18,7 @@ use asyncgit::{
 };
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Rect},
 	widgets::Clear,

diff --git a/src/components/create_branch.rs b/src/components/create_branch.rs
@@ -13,7 +13,7 @@ use anyhow::Result;
 use asyncgit::sync::{self, RepoPathRef};
 use crossterm::event::Event;
 use easy_cast::Cast;
-use tui::{
+use ratatui::{
 	backend::Backend, layout::Rect, widgets::Paragraph, Frame,
 };
 

diff --git a/src/components/cred.rs b/src/components/cred.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use crossterm::event::Event;
-use tui::{backend::Backend, layout::Rect, Frame};
+use ratatui::{backend::Backend, layout::Rect, Frame};
 
 use asyncgit::sync::cred::BasicAuthCredential;
 

diff --git a/src/components/diff.rs b/src/components/diff.rs
@@ -20,15 +20,15 @@ use asyncgit::{
 };
 use bytesize::ByteSize;
 use crossterm::event::Event;
-use std::{borrow::Cow, cell::Cell, cmp, path::Path};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::Rect,
 	symbols,
 	text::{Span, Spans},
 	widgets::{Block, Borders, Paragraph},
 	Frame,
 };
+use std::{borrow::Cow, cell::Cell, cmp, path::Path};
 
 #[derive(Default)]
 struct Current {

diff --git a/src/components/externaleditor.rs b/src/components/externaleditor.rs
@@ -16,16 +16,16 @@ use crossterm::{
 	terminal::{EnterAlternateScreen, LeaveAlternateScreen},
 	ExecutableCommand,
 };
-use scopeguard::defer;
-use std::ffi::OsStr;
-use std::{env, io, path::Path, process::Command};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::Rect,
 	text::{Span, Spans},
 	widgets::{Block, BorderType, Borders, Clear, Paragraph},
 	Frame,
 };
+use scopeguard::defer;
+use std::ffi::OsStr;
+use std::{env, io, path::Path, process::Command};
 
 ///
 pub struct ExternalEditorComponent {

diff --git a/src/components/fetch.rs b/src/components/fetch.rs
@@ -22,7 +22,7 @@ use asyncgit::{
 };
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::Rect,
 	text::Span,

diff --git a/src/components/file_find_popup.rs b/src/components/file_find_popup.rs
@@ -13,14 +13,14 @@ use anyhow::Result;
 use asyncgit::sync::TreeFile;
 use crossterm::event::Event;
 use fuzzy_matcher::FuzzyMatcher;
-use std::borrow::Cow;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Margin, Rect},
 	text::{Span, Spans},
 	widgets::{Block, Borders, Clear},
 	Frame,
 };
+use std::borrow::Cow;
 
 pub struct FileFindPopup {
 	queue: Queue,

diff --git a/src/components/file_revlog.rs b/src/components/file_revlog.rs
@@ -24,7 +24,7 @@ use asyncgit::{
 use chrono::{DateTime, Local};
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Constraint, Direction, Layout, Rect},
 	text::{Span, Spans, Text},

diff --git a/src/components/help.rs b/src/components/help.rs
@@ -11,15 +11,15 @@ use anyhow::Result;
 use asyncgit::hash;
 use crossterm::event::Event;
 use itertools::Itertools;
-use std::{borrow::Cow, cmp, convert::TryFrom};
-use tui::{
+use ratatui::{
 	backend::Backend,
 	layout::{Alignment, Constraint, Direction, Layout, Rect},
 	style::{Modifier, Style},
 	text::{Span, Spans},
 	widgets::{Block, BorderType, Borders, Clear, Paragraph},
 	Frame,
 };
+use std::{borrow::Cow, cmp, convert::TryFrom};
 use ui::style::SharedTheme;
 
 ///