Moved tree::progress::* back into crate::progress

CHANGELOG.md

@@ -14,6 +14,7 @@
 ### Breaking
 
 * In `Progress::init(max, unit)` , `unit` now is `Option<Unit>`, existing code can be transformed using `progress.init(None, Some("label".into()))`.
+* moved `tree::progress` into `progress` and renamed `Value` into `Task` and `Progress` into `Value`
 * **removed** `deep_eq()` method in `Root` tree
 * tui engine option `redraw_only_on_state_change` was removed without substitute
 * **Move and rename**

src/render/line/draw.rs

@@ -1,5 +1,6 @@
 use crate::{
-    tree::{self, progress, Progress},
+    progress::{self, Progress},
+    tree::{self},
     unit,
 };
 use crosstermion::{

src/render/tui/draw/all.rs

@@ -1,10 +1,11 @@
 use crate::{
+    progress::Value,
     render::tui::{
         draw,
         utils::{block_width, rect},
         InterruptDrawInfo, Line,
     },
-    tree::{self, progress::Value, Key, Message},
+    tree::{self, Key, Message},
 };
 use std::time::Duration;
 use tui::{

src/render/tui/draw/progress.rs

@@ -1,4 +1,5 @@
 use crate::{
+    progress::{self, Progress, Step, Value},
     render::tui::{
         draw::State,
         utils::{
@@ -8,11 +9,7 @@ use crate::{
         InterruptDrawInfo,
     },
     time::format_now_datetime_seconds,
-    tree::{
-        self,
-        progress::{self, Step, Value},
-        Key, Progress,
-    },
+    tree::{self, Key},
     unit,
 };
 use humantime::format_duration;

src/tree/item.rs

@@ -1,9 +1,6 @@
 use crate::{
-    tree::{
-        messages::MessageRingBuffer,
-        progress::{Progress, State, Step, Value},
-        Key, MessageLevel,
-    },
+    progress::{Progress, State, Step, Value},
+    tree::{messages::MessageRingBuffer, Key, MessageLevel},
     unit::Unit,
 };
 use dashmap::DashMap;

src/tree/key.rs

@@ -1,4 +1,4 @@
-use crate::{tree::item, tree::progress::Value};
+use crate::{progress::Value, tree::item};
 use std::ops::{Index, IndexMut};
 
 // NOTE: This means we will show weird behaviour if there are more than 2^16 tasks at the same time on a level

src/tree/mod.rs

@@ -14,9 +14,6 @@ mod throughput;
 pub use throughput::Throughput;
 
 pub mod key;
-pub mod progress;
-#[doc(inline)]
-pub use progress::Progress;
 
 #[doc(inline)]
 pub use key::{Key, Level};

src/tree/root.rs

@@ -1,4 +1,7 @@
-use crate::tree::{messages::MessageRingBuffer, progress::Value, Item, Key, Message, MessageCopyState};
+use crate::{
+    progress::Value,
+    tree::{messages::MessageRingBuffer, Item, Key, Message, MessageCopyState},
+};
 use dashmap::DashMap;
 use parking_lot::Mutex;
 use std::sync::Arc;

src/tree/tests.rs

@@ -116,8 +116,8 @@ mod message_buffer {
 
 mod key_adjacency {
     use crate::{
+        progress::Value,
         tree::key::SiblingLocation::*,
-        tree::progress::Value,
         tree::{key::Adjacency, Key},
     };
 

src/tree/throughput.rs

@@ -1,4 +1,7 @@
-use crate::{tree, tree::progress, tree::Progress, unit};
+use crate::{
+    progress::{self, Progress},
+    tree, unit,
+};
 use std::time::{Duration, SystemTime};
 
 const THROTTLE_INTERVAL: Duration = Duration::from_secs(1);

src/unit/bytes.rs

@@ -1,4 +1,4 @@
-use crate::{tree::progress::Step, unit::DisplayValue};
+use crate::{progress::Step, unit::DisplayValue};
 use std::fmt;
 
 #[derive(Copy, Clone, Default, Eq, PartialEq, Ord, PartialOrd, Debug)]

src/unit/display.rs

@@ -1,5 +1,5 @@
 use crate::{
-    tree::progress::Step,
+    progress::Step,
     unit::{DisplayValue, Unit},
 };
 use std::fmt::{self, Write};

src/unit/duration.rs

@@ -1,4 +1,4 @@
-use crate::{tree::progress::Step, unit::DisplayValue};
+use crate::{progress::Step, unit::DisplayValue};
 use std::fmt;
 
 #[derive(Copy, Clone, Default, Eq, PartialEq, Ord, PartialOrd, Debug)]

src/unit/human.rs

@@ -1,4 +1,4 @@
-use crate::{tree::progress::Step, unit::DisplayValue};
+use crate::{progress::Step, unit::DisplayValue};
 pub use human_format::{Formatter, Scales};
 use std::fmt;
 

src/unit/mod.rs

@@ -1,4 +1,4 @@
-use crate::tree::progress::Step;
+use crate::progress::Step;
 use std::{fmt, ops::Deref, sync::Arc};
 
 #[cfg(feature = "unit-bytes")]

src/unit/range.rs

@@ -1,4 +1,4 @@
-use crate::{tree::progress::Step, unit::DisplayValue};
+use crate::{progress::Step, unit::DisplayValue};
 use std::fmt;
 
 #[derive(Copy, Clone, Default, Eq, PartialEq, Ord, PartialOrd, Debug)]

src/unit/traits.rs

@@ -1,4 +1,4 @@
-use crate::{tree::progress::Step, unit::display};
+use crate::{progress::Step, unit::display};
 use std::fmt;
 
 pub trait DisplayValue {