diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/display/components/header_details.rs | 12 | ||||
-rw-r--r-- | src/display/components/help_text.rs | 12 | ||||
-rw-r--r-- | src/display/components/layout.rs | 16 | ||||
-rw-r--r-- | src/display/components/table.rs | 12 | ||||
-rw-r--r-- | src/display/raw_terminal_backend.rs | 6 | ||||
-rw-r--r-- | src/display/ui.rs | 4 | ||||
-rw-r--r-- | src/main.rs | 4 | ||||
-rw-r--r-- | src/tests/fakes/fake_output.rs | 6 |
8 files changed, 36 insertions, 36 deletions
diff --git a/src/display/components/header_details.rs b/src/display/components/header_details.rs index c321265..768f64d 100644 --- a/src/display/components/header_details.rs +++ b/src/display/components/header_details.rs @@ -1,11 +1,11 @@ use crate::display::{DisplayBandwidth, UIState}; +use ::ratatui::backend::Backend; +use ::ratatui::layout::{Alignment, Rect}; +use ::ratatui::style::{Color, Modifier, Style}; +use ::ratatui::terminal::Frame; +use ::ratatui::text::Span; +use ::ratatui::widgets::Paragraph; use ::std::time::{Duration, Instant}; -use ::tui::backend::Backend; -use ::tui::layout::{Alignment, Rect}; -use ::tui::style::{Color, Modifier, Style}; -use ::tui::terminal::Frame; -use ::tui::text::Span; -use ::tui::widgets::Paragraph; const SECONDS_IN_DAY: u64 = 86400; diff --git a/src/display/components/help_text.rs b/src/display/components/help_text.rs index 29c8267..6fd0759 100644 --- a/src/display/components/help_text.rs +++ b/src/display/components/help_text.rs @@ -1,9 +1,9 @@ -use ::tui::backend::Backend; -use ::tui::layout::{Alignment, Rect}; -use ::tui::style::{Modifier, Style}; -use ::tui::terminal::Frame; -use ::tui::text::Span; -use ::tui::widgets::Paragraph; +use ::ratatui::backend::Backend; +use ::ratatui::layout::{Alignment, Rect}; +use ::ratatui::style::{Modifier, Style}; +use ::ratatui::terminal::Frame; +use ::ratatui::text::Span; +use ::ratatui::widgets::Paragraph; pub struct HelpText { pub paused: bool, diff --git a/src/display/components/layout.rs b/src/display/components/layout.rs index 51c0175..06cc0db 100644 --- a/src/display/components/layout.rs +++ b/src/display/components/layout.rs @@ -1,6 +1,6 @@ -use ::tui::backend::Backend; -use ::tui::layout::{Constraint, Direction, Rect}; -use ::tui::terminal::Frame; +use ::ratatui::backend::Backend; +use ::ratatui::layout::{Constraint, Direction, Rect}; +use ::ratatui::terminal::Frame; use super::HeaderDetails; use super::HelpText; @@ -10,7 +10,7 @@ const FIRST_HEIGHT_BREAKPOINT: u16 = 30; const FIRST_WIDTH_BREAKPOINT: u16 = 120; fn top_app_and_bottom_split(rect: Rect) -> (Rect, Rect, Rect) { - let parts = ::tui::layout::Layout::default() + let parts = ::ratatui::layout::Layout::default() .direction(Direction::Vertical) .margin(0) .constraints( @@ -37,12 +37,12 @@ impl<'a> Layout<'a> { .into_iter() .fold(vec![rect], |mut layout, direction| { let last_rect = layout.pop().unwrap(); - let mut halves = ::tui::layout::Layout::default() + let halves = ::ratatui::layout::Layout::default() .direction(direction) .margin(0) .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .split(last_rect); - layout.append(&mut halves); + layout.append(&mut halves.to_vec()); layout }) } @@ -74,12 +74,12 @@ impl<'a> Layout<'a> { self.progressive_split(rect, vec![Direction::Vertical]) } else { // default layout - let halves = ::tui::layout::Layout::default() + let halves = ::ratatui::layout::Layout::default() .direction(Direction::Vertical) .margin(0) .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .split(rect); - let top_quarters = ::tui::layout::Layout::default() + let top_quarters = ::ratatui::layout::Layout::default() .direction(Direction::Horizontal) .margin(0) .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) diff --git a/src/display/components/table.rs b/src/display/components/table.rs index d161451..ccfd9c5 100644 --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -2,11 +2,11 @@ use ::std::collections::{BTreeMap, HashMap}; use ::std::iter::FromIterator; use ::unicode_width::UnicodeWidthChar; -use ::tui::backend::Backend; -use ::tui::layout::{Constraint, Rect}; -use ::tui::style::{Color, Style}; -use ::tui::terminal::Frame; -use ::tui::widgets::{Block, Borders, Row}; +use ::ratatui::backend::Backend; +use ::ratatui::layout::{Constraint, Rect}; +use ::ratatui::style::{Color, Style}; +use ::ratatui::terminal::Frame; +use ::ratatui::widgets::{Block, Borders, Row}; use crate::display::{Bandwidth, DisplayBandwidth, UIState}; use crate::network::{display_connection_string, display_ip_or_host}; @@ -292,7 +292,7 @@ impl<'a> Table<'a> { let table_rows = rows.map(|row| Row::new(row).style(Style::default())); let width_constraints: Vec<Constraint> = widths.iter().map(|w| Constraint::Length(*w)).collect(); - let table = ::tui::widgets::Table::new(table_rows) + let table = ::ratatui::widgets::Table::new(table_rows) .block(Block::default().title(self.title).borders(Borders::ALL)) .header(Row::new(column_names).style(Style::default().fg(Color::Yellow))) .widths(&width_constraints) diff --git a/src/display/raw_terminal_backend.rs b/src/display/raw_terminal_backend.rs index 3ae299a..48b4b50 100644 --- a/src/display/raw_terminal_backend.rs +++ b/src/display/raw_terminal_backend.rs @@ -7,10 +7,10 @@ // that implements the Backend TUI trait, but does nothing // this way, we don't need to create the TermionBackend // and thus skew our stdout when we don't need it +use ::ratatui::backend::Backend; +use ::ratatui::buffer::Cell; +use ::ratatui::layout::Rect; use ::std::io; -use ::tui::backend::Backend; -use ::tui::buffer::Cell; -use ::tui::layout::Rect; pub struct RawTerminalBackend {} diff --git a/src/display/ui.rs b/src/display/ui.rs index 9a1bf80..bc459cc 100644 --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -1,7 +1,7 @@ use ::std::collections::HashMap; -use ::tui::backend::Backend; -use ::tui::Terminal; +use ::ratatui::backend::Backend; +use ::ratatui::Terminal; use crate::display::components::{HeaderDetails, HelpText, Layout, Table}; use crate::display::UIState; diff --git a/src/main.rs b/src/main.rs index 445e4fb..dfc8ce9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,13 +20,13 @@ use ::std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use ::std::sync::{Arc, Mutex}; use ::std::thread; use ::std::thread::park_timeout; -use ::tui::backend::Backend; +use ::ratatui::backend::Backend; use std::process; use ::std::net::Ipv4Addr; use ::std::time::{Duration, Instant}; -use ::tui::backend::CrosstermBackend; +use ::ratatui::backend::CrosstermBackend; use std::sync::RwLock; use structopt::StructOpt; diff --git a/src/tests/fakes/fake_output.rs b/src/tests/fakes/fake_output.rs index ef7ea3c..dd345e4 100644 --- a/src/tests/fakes/fake_output.rs +++ b/src/tests/fakes/fake_output.rs @@ -1,9 +1,9 @@ +use ::ratatui::backend::Backend; +use ::ratatui::buffer::Cell; +use ::ratatui::layout::Rect; use ::std::collections::HashMap; use ::std::io; use ::std::sync::{Arc, Mutex}; -use ::tui::backend::Backend; -use ::tui::buffer::Cell; -use ::tui::layout::Rect; #[derive(Hash, Debug, PartialEq)] pub enum TerminalEvent { |