progress: Rename NestEqual from Nest

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cli/forgame.rs b/cli/forgame.rs
index 70b2a7a08e1f60e7304fdff83d662612ef73d75f..ff8c0a794fcb079d92b2712ef749c4488b3a078e 100644 (file)
--- a/cli/forgame.rs
+++ b/cli/forgame.rs
@@ -143,7 +143,7 @@ mod reset_game {
             clear_game(&ma, &mut chan)?;
           }
           let progress = ma.progressbar()?;
-          let mut progress = termprogress::Nest::new(local.len(), progress);
+          let mut progress = termprogress::NestEqual::new(local.len(), progress);
           for bundle in local {
             bundle.upload(&ma, &mut chan, &mut progress)?;
           }

diff --git a/support/termprogress.rs b/support/termprogress.rs
index 7864d24d281ef8e509ebf84ea77d3d67fb3f30c2..8426df76715763c5cae21bb8ae706122ecf24a21 100644 (file)
--- a/support/termprogress.rs
+++ b/support/termprogress.rs
@@ -161,17 +161,17 @@ impl Drop for TermReporter {
   }
 }
 
-pub struct Nest {
+pub struct NestEqual {
   outer_n: usize,
   outer_i: usize,
   inner_last_frac: f32,
   actual_reporter: Box<dyn Reporter>,
 }
 
-impl Nest {
+impl NestEqual {
   /// Assumes that every inner phase is of the same length as the first
   pub fn new(outer_count: usize, actual_reporter: Box<dyn Reporter>)
-             -> Self { Nest {
+             -> Self { NestEqual {
     actual_reporter,
     outer_n: outer_count,
     outer_i: 0,
@@ -179,7 +179,7 @@ impl Nest {
   } }
 }
 
-impl Reporter for Nest {
+impl Reporter for NestEqual {
   fn report(&mut self, inner_pi: &ProgressInfo<'_>) {
     use progress::Value;