From 0b3990b9c38486dbf79835ae3b87d2654cf1d5cb Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 21:43:09 +0100
Subject: [PATCH] progress: Rename NestEqual from Nest

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 cli/forgame.rs          | 2 +-
 support/termprogress.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/forgame.rs b/cli/forgame.rs
index 70b2a7a0..ff8c0a79 100644
--- 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 7864d24d..8426df76 100644
--- 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;
 
-- 
2.30.2