chiark / gitweb /
bundles: Provide for_progress as a useful trait object in bulk
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 12 May 2021 18:39:22 +0000 (19:39 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 May 2021 00:57:53 +0000 (01:57 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/bundles.rs

index a0f9ac0a0c91e511e1865a058108a6b1d93d772b..e2f7ce3cc53ccdb1a39f344ee37ab9e1efff05fe 100644 (file)
@@ -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 }
   }