Add 'inc()' convenience methods to progress

Sebastian Thiel committed 6 years ago

Commit 2e46c9b1 parent 4018c966 files · +53 −14Browse files

Showing the changes to git-features/src/progress (3 of 6 files). Show all

Unified · Split

3 files

git-features/src/progress/log.rs +8 −0
git-features/src/progress/mod.rs +27 −0
git-features/src/progress/prodash.rs +4 −0

     max: Option<u32>,
     unit: Option<&'static str>,
     last_set: Option<std::time::SystemTime>,
+    step: u32,
     current_level: usize,
     max_level: usize,
 }
             current_level: 0,
             max_level: max_level.unwrap_or(usize::MAX),
             max: None,
+            step: 0,
             unit: None,
             last_set: None,
         }
             name: format!("{}::{}", self.name, Into::<String>::into(name)),
             current_level: self.current_level + 1,
             max_level: self.max_level,
+            step: 0,
             max: None,
             unit: None,
             last_set: None,
     }
     fn set(&mut self, step: u32) {
+        self.step = step;
         if self.current_level > self.max_level {
             return;
         }
         }
     }
+    fn inc_by(&mut self, step: u32) {
+        self.set(self.step + step)
+    }
     fn message(&mut self, level: MessageLevel, message: impl Into<String>) {
         let message: String = message.into();
         match level {

git-features/src/progress/mod.rs+27−0

@@ -38,6 +38,20 @@ pub trait Progress { · 37 unmodified lines
38	/// Note: that this call has no effect unless `init(…)` was called before.	38	/// Note: that this call has no effect unless `init(…)` was called before.
39	fn set(&mut self, step: u32);	39	fn set(&mut self, step: u32);
40		40
		41	/// Increment the current progress to the given `step`. The cost of this call is negligible,
		42	/// making manual throttling not necessary.
		43	///
		44	/// Note: that this call has no effect unless `init(…)` was called before.
		45	fn inc_by(&mut self, step: u32);
		46
		47	/// Increment the current progress to the given 1. The cost of this call is negligible,
		48	/// making manual throttling not necessary.
		49	///
		50	/// Note: that this call has no effect unless `init(…)` was called before.
		51	fn inc(&mut self) {
		52	self.inc_by(1)
		53	}
		54
41	/// Create a `message` of the given `level` and store it with the progress tree.	55	/// Create a `message` of the given `level` and store it with the progress tree.
42	///	56	///
43	/// Use this to provide additional,human-readable information about the progress	57	/// Use this to provide additional,human-readable information about the progress
@@ -71,6 +85,8 @@ impl Progress for Discard { · 27 unmodified lines
71		85
72	fn set(&mut self, _step: u32) {}	86	fn set(&mut self, _step: u32) {}
73		87
		88	fn inc_by(&mut self, _step: u32) {}
		89
74	fn message(&mut self, _level: MessageLevel, _message: impl Into<String>) {}	90	fn message(&mut self, _level: MessageLevel, _message: impl Into<String>) {}
75	}	91	}
76		92
@@ -107,6 +123,13 @@ where · 30 unmodified lines
107	}	123	}
108	}	124	}
109		125
		126	fn inc_by(&mut self, step: u32) {
		127	match self {
		128	Either::Left(l) => l.inc_by(step),
		129	Either::Right(r) => r.inc_by(step),
		130	}
		131	}
		132
110	fn message(&mut self, level: MessageLevel, message: impl Into<String>) {	133	fn message(&mut self, level: MessageLevel, message: impl Into<String>) {
111	match self {	134	match self {
112	Either::Left(l) => l.message(level, message),	135	Either::Left(l) => l.message(level, message),
@@ -147,6 +170,10 @@ where · 34 unmodified lines
147	self.0.set(step)	170	self.0.set(step)
148	}	171	}
149		172
		173	fn inc_by(&mut self, step: u32) {
		174	self.0.inc_by(step)
		175	}
		176
150	fn message(&mut self, level: MessageLevel, message: impl Into<String>) {	177	fn message(&mut self, level: MessageLevel, message: impl Into<String>) {
151	self.0.message(level, message)	178	self.0.message(level, message)
152	}	179	}

git-features/src/progress/prodash.rs+4−0

         Item::set(self, step)
     }
+    fn inc_by(&mut self, step: u32) {
+        self.inc_by(step)
+    }
     fn message(&mut self, level: MessageLevel, message: impl Into<String>) {
         Item::message(
             self,