From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 17 May 2021 10:16:17 +0000 (+0100)
Subject: bundles progress: Rework to do the duplex disablement here
X-Git-Tag: otter-0.6.0~204
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab08efb56ed50ba2547ea453479e217e531ff6a5;p=otter.git

bundles progress: Rework to do the duplex disablement here

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

diff --git a/src/bundles.rs b/src/bundles.rs
index 14b67665..58b466c6 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -875,13 +875,16 @@ impl Uploading {
   where R: Read, PW: Write
   {
     let mut for_progress = progress::ResponseOriginator::new(for_progress);
-    let for_progress: &mut dyn progress::Originator = &mut for_progress;
 
     let Uploading { id, mut file, instance } = self;
     let tmp = id.path_tmp(&instance);
 
+    let mut null_progress = ();
+    let for_progress_upload: &mut dyn progress::Originator =
+      if false { &mut for_progress } else { &mut null_progress };
+    
     let mut data_reporter = progress::ReadOriginator::new(
-      for_progress, Phase::Upload, size, data);
+      for_progress_upload, Phase::Upload, size, data);
 
     let copied_size = match io::copy(&mut data_reporter, &mut file) {
       Err(e) if e.kind() == ErrorKind::TimedOut => throw!(ME::UploadTimeout),
@@ -901,9 +904,9 @@ impl Uploading {
     file.rewind().context("rewind"). map_err(IE::from)?;
 
     let (za, parsed) = parse_bundle(id, &instance, file, BundleParseUpload,
-                                    for_progress)?;
+                                    &mut for_progress)?;
 
-    process_bundle(za, id, &*instance, for_progress)?;
+    process_bundle(za, id, &*instance, &mut for_progress)?;
 
     Uploaded { id, parsed }
   }