From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 May 2021 18:39:22 +0000 (+0100)
Subject: bundles: Provide for_progress as a useful trait object in bulk
X-Git-Tag: otter-0.6.0~323
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=138609156307a1a4dfbbbab54d5855b88c4e5e95;p=otter.git

bundles: Provide for_progress as a useful trait object in bulk

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

diff --git a/src/bundles.rs b/src/bundles.rs
index a0f9ac0a..e2f7ce3c 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -714,6 +714,7 @@ impl Uploading {
   where R: Read, PW: Write
   {
     let mut for_progress = progress::ResponseReporter::new(for_progress);
+    let mut for_progress: &mut dyn progress::Reporter = &mut for_progress;
 
     let Uploading { id, mut file, instance } = self;
     let tmp = id.path_tmp(&instance);
@@ -731,9 +732,9 @@ impl Uploading {
     file.rewind().context("rewind"). map_err(IE::from)?;
 
     let (za, parsed) = parse_bundle(id, &instance, file, BundleParseUpload,
-                              &mut for_progress)?;
+                                    for_progress)?;
 
-    process_bundle(za, id, &*instance, &mut for_progress)?;
+    process_bundle(za, id, &*instance, for_progress)?;
 
     Uploaded { id, parsed }
   }