Merge branch 'ratatui'

Author: Byron

Cargo.toml

@@ -72,14 +72,14 @@ parking_lot = { version = "0.12.1", optional = true, default-features = false }
 log = { version = "0.4.8", optional = true }
 
 # render-tui
-tui = { version = "0.19.0", optional = true, default-features = false }
-tui-react = { version = "0.19.0", optional = true }
+tui = { package = "ratatui", version = "0.20.1", optional = true, default-features = false }
+tui-react = { version = "0.20.0", optional = true }
 futures-core = { version = "0.3.4", optional = true, default-features = false }
 futures-lite = { version = "1.5.0", optional = true }
 humantime = { version = "2.0.0", optional = true }
 unicode-segmentation = { version = "1.6.0", optional = true }
 unicode-width = { version = "0.1.7", optional = true }
-crosstermion = { version = "0.10.1", optional = true, default-features = false }
+crosstermion = { version = "0.11.0", optional = true, default-features = false }
 async-io = { version = "1.0.0", optional = true }
 
 # localtime support for render-tui

src/progress/key.rs

@@ -15,12 +15,13 @@ pub(crate) type Id = u16;
 pub struct Key(Option<Id>, Option<Id>, Option<Id>, Option<Id>, Option<Id>, Option<Id>);
 
 /// Determines if a sibling is above or below in the given level of hierarchy
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
 #[allow(missing_docs)]
 pub enum SiblingLocation {
     Above,
     Below,
     AboveAndBelow,
+    #[default]
     NotFound,
 }
 
@@ -40,12 +41,6 @@ impl SiblingLocation {
     }
 }
 
-impl Default for SiblingLocation {
-    fn default() -> Self {
-        SiblingLocation::NotFound
-    }
-}
-
 /// A type providing information about what's above and below `Tree` items.
 #[derive(Copy, Clone, Default, Eq, PartialEq, Ord, PartialOrd, Debug)]
 pub struct Adjacency(

src/progress/mod.rs

@@ -41,7 +41,7 @@ pub type Step = usize;
 pub type StepShared = Arc<AtomicUsize>;
 
 /// Indicate whether a progress can or cannot be made.
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash)]
 pub enum State {
     /// Indicates a task is blocked and cannot indicate progress, optionally until the
     /// given time. The task cannot easily be interrupted.
@@ -50,15 +50,10 @@ pub enum State {
     /// given time. The task can be interrupted.
     Halted(&'static str, Option<SystemTime>),
     /// The task is running
+    #[default]
     Running,
 }
 
-impl Default for State {
-    fn default() -> Self {
-        State::Running
-    }
-}
-
 /// Progress associated with some item in the progress tree.
 #[derive(Clone, Default, Debug)]
 pub struct Value {

src/render/line/draw.rs

@@ -230,13 +230,7 @@ fn block_count_sans_ansi_codes(strings: &[ANSIString<'_>]) -> u16 {
     strings.iter().map(|s| s.width() as u16).sum()
 }
 
-fn draw_progress_bar<'a>(
-    p: &Value,
-    style: Style,
-    mut blocks_available: u16,
-    colored: bool,
-    buf: &mut Vec<ANSIString<'a>>,
-) {
+fn draw_progress_bar(p: &Value, style: Style, mut blocks_available: u16, colored: bool, buf: &mut Vec<ANSIString<'_>>) {
     let mut brush = color::Brush::new(colored);
     let styled_brush = brush.style(style);