cli bundle progress: clear before thinking about bundles

Otherwise the output is a bit messed up.

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

diff --git a/cli/forgame.rs b/cli/forgame.rs
index 7153417fe638857177534c1f54bc624a92477306..e8116459af55f0d126cdba678733b48b8a3aa098 100644 (file)
--- a/cli/forgame.rs
+++ b/cli/forgame.rs
@@ -103,6 +103,7 @@ mod reset_game {
         MR::Bundles { bundles } => bundles,
         x => throw!(anyhow!("unexpected response to ListBundles: {:?}",x)),
       };
+      progress.clear();
 
       let bundles_only = args.bundles_only;
       match Itertools::zip_longest(

diff --git a/support/imports.rs b/support/imports.rs
index 2202a7abfcda1582f1a968d92187c4913ba57016..df39193b750a2025ce0f192e8306068b20cb03f5 100644 (file)
--- a/support/imports.rs
+++ b/support/imports.rs
@@ -86,7 +86,7 @@ pub use crate::packetframe::{PacketFrameReadError, PacketFrameWriteError};
 pub use crate::progress::{self, ProgressInfo, OriginatorExt as _};
 pub use crate::slotmap_slot_idx::*;
 pub use crate::support::*;
-pub use crate::termprogress;
+pub use crate::termprogress::{self, Reporter as _};
 pub use crate::timedfd::*;
 pub use crate::toml_de;
 pub use crate::tz::*;