diff options
author | Orhun Parmaksız <orhunparmaksiz@gmail.com> | 2023-09-11 13:42:43 +0300 |
---|---|---|
committer | Orhun Parmaksız <orhunparmaksiz@gmail.com> | 2023-09-11 13:42:43 +0300 |
commit | 6cda178d61041b7372d647fb4c47b3e360ac2634 (patch) | |
tree | 262ff4c44e081164478377fdc29716e5fe035e73 | |
parent | b375000f5abde8fb85132efd3200d0bda9d56771 (diff) |
chore(deps): bump ratatui dependency
-rw-r--r-- | Cargo.lock | 18 | ||||
-rw-r--r-- | systeroid-tui/Cargo.toml | 5 | ||||
-rw-r--r-- | systeroid-tui/src/error.rs | 2 | ||||
-rw-r--r-- | systeroid-tui/src/lib.rs | 6 | ||||
-rw-r--r-- | systeroid-tui/src/main.rs | 2 | ||||
-rw-r--r-- | systeroid-tui/src/style.rs | 2 | ||||
-rw-r--r-- | systeroid-tui/src/ui.rs | 12 | ||||
-rw-r--r-- | systeroid-tui/src/widgets.rs | 2 | ||||
-rw-r--r-- | systeroid-tui/tests/integration_test.rs | 6 |
9 files changed, 21 insertions, 34 deletions
@@ -839,19 +839,6 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce841e0486e7c2412c3740168ede33adeba8e154a15107b879d8162d77c7174e" -dependencies = [ - "bitflags 1.3.2", - "cassowary", - "termion", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "ratatui" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8285baa38bdc9f879d92c0e37cb562ef38aa3aeefca22b3200186bc39242d3d5" @@ -860,6 +847,7 @@ dependencies = [ "cassowary", "indoc", "paste", + "termion", "unicode-segmentation", "unicode-width", ] @@ -1138,7 +1126,7 @@ dependencies = [ "copypasta-ext", "getopts", "log", - "ratatui 0.21.0", + "ratatui", "systeroid-core", "termion", "thiserror", @@ -1217,7 +1205,7 @@ dependencies = [ "lazy_static", "log", "parking_lot", - "ratatui 0.22.0", + "ratatui", ] [[package]] diff --git a/systeroid-tui/Cargo.toml b/systeroid-tui/Cargo.toml index dd95c2d..b7d6a88 100644 --- a/systeroid-tui/Cargo.toml +++ b/systeroid-tui/Cargo.toml @@ -29,9 +29,8 @@ log.workspace = true version = "0.4.2" # managed by release.sh path = "../systeroid-core" -[dependencies.tui] -package = "ratatui" -version = "0.21.0" +[dependencies.ratatui] +version = "0.22.0" default-features = false features = ["termion"] diff --git a/systeroid-tui/src/error.rs b/systeroid-tui/src/error.rs index 448adcd..ba7adbd 100644 --- a/systeroid-tui/src/error.rs +++ b/systeroid-tui/src/error.rs @@ -14,7 +14,7 @@ pub enum Error { ClipboardError(String), /// Error that may occur while parsing a color. #[error(transparent)] - ColorParseError(#[from] tui::style::ParseColorError), + ColorParseError(#[from] ratatui::style::ParseColorError), /// Error that may occur if the logger is already set. #[error(transparent)] LoggerSetError(#[from] log::SetLoggerError), diff --git a/systeroid-tui/src/lib.rs b/systeroid-tui/src/lib.rs index 8044c27..824efbd 100644 --- a/systeroid-tui/src/lib.rs +++ b/systeroid-tui/src/lib.rs @@ -29,13 +29,13 @@ use crate::event::{Event, EventHandler}; use crate::style::Colors; use command::LoggerCommand; use log::LevelFilter; +use ratatui::backend::Backend; +use ratatui::terminal::Terminal; use std::env; use std::str::FromStr; use systeroid_core::cache::Cache; use systeroid_core::config::Config; use systeroid_core::sysctl::controller::Sysctl; -use tui::backend::Backend; -use tui::terminal::Terminal; /// Runs `systeroid-tui`. pub fn run<B: Backend>(args: Args, backend: B) -> Result<()> { @@ -114,7 +114,7 @@ pub fn run<B: Backend>(args: Args, backend: B) -> Result<()> { #[cfg(test)] mod tests { use super::*; - use tui::backend::TestBackend; + use ratatui::backend::TestBackend; #[test] fn test_systeroid_tui() -> Result<()> { diff --git a/systeroid-tui/src/main.rs b/systeroid-tui/src/main.rs index 986bcd4..0e9403e 100644 --- a/systeroid-tui/src/main.rs +++ b/systeroid-tui/src/main.rs @@ -1,3 +1,4 @@ +use ratatui::backend::TermionBackend; use std::env; use std::io; use std::process; @@ -6,7 +7,6 @@ use systeroid_tui::error::Result; use termion::input::MouseTerminal; use termion::raw::IntoRawMode; use termion::screen::IntoAlternateScreen; -use tui::backend::TermionBackend; fn main() -> Result<()> { if let Some(args) = Args::parse(env::args().collect()) { diff --git a/systeroid-tui/src/style.rs b/systeroid-tui/src/style.rs index 1fb636a..c9db53e 100644 --- a/systeroid-tui/src/style.rs +++ b/systeroid-tui/src/style.rs @@ -1,6 +1,6 @@ use crate::error::Result; +use ratatui::style::{Color as TuiColor, Style}; use std::str::FromStr; -use tui::style::{Color as TuiColor, Style}; /// Color configuration. #[derive(Clone, Copy, Debug, PartialEq, Eq)] diff --git a/systeroid-tui/src/ui.rs b/systeroid-tui/src/ui.rs index 6f3fa13..39d564f 100644 --- a/systeroid-tui/src/ui.rs +++ b/systeroid-tui/src/ui.rs @@ -1,12 +1,12 @@ use crate::app::{App, KeyBinding, HELP_TEXT}; use crate::style::Colors; use crate::widgets::SelectableList; -use tui::backend::Backend; -use tui::layout::{Alignment, Constraint, Direction, Layout, Rect}; -use tui::style::{Color as TuiColor, Style}; -use tui::text::{Span, Text}; -use tui::widgets::{Block, BorderType, Borders, Cell, Clear, Paragraph, Row, Table, Wrap}; -use tui::Frame; +use ratatui::backend::Backend; +use ratatui::layout::{Alignment, Constraint, Direction, Layout, Rect}; +use ratatui::style::{Color as TuiColor, Style}; +use ratatui::text::{Span, Text}; +use ratatui::widgets::{Block, BorderType, Borders, Cell, Clear, Paragraph, Row, Table, Wrap}; +use ratatui::Frame; use tui_logger::{TuiLoggerLevelOutput, TuiLoggerSmartWidget}; use unicode_width::UnicodeWidthStr; diff --git a/systeroid-tui/src/widgets.rs b/systeroid-tui/src/widgets.rs index 759864e..f354cf1 100644 --- a/systeroid-tui/src/widgets.rs +++ b/systeroid-tui/src/widgets.rs @@ -1,4 +1,4 @@ -use tui::widgets::TableState as State; +use ratatui::widgets::TableState as State; /// List widget with TUI controlled states. #[derive(Debug)] diff --git a/systeroid-tui/tests/integration_test.rs b/systeroid-tui/tests/integration_test.rs index 9a5da5d..b1c9954 100644 --- a/systeroid-tui/tests/integration_test.rs +++ b/systeroid-tui/tests/integration_test.rs @@ -1,3 +1,6 @@ +use ratatui::backend::{Backend, TestBackend}; +use ratatui::buffer::Buffer; +use ratatui::Terminal; use std::path::PathBuf; use std::thread; use std::time::Duration; @@ -11,9 +14,6 @@ use systeroid_tui::error::Result; use systeroid_tui::options::{Direction, ScrollArea}; use systeroid_tui::style::Colors; use systeroid_tui::ui::render; -use tui::backend::{Backend, TestBackend}; -use tui::buffer::Buffer; -use tui::Terminal; fn assert_buffer(mut buffer: Buffer, backend: &TestBackend) -> Result<()> { assert_eq!(buffer.area, backend.size()?); |