From d17da1bc9e1b72cf5cf6d540a5c3bb6796ce7324 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 May 2021 11:16:35 +0100 Subject: [PATCH] Revert "progress: Disable the upload progress for now" This is now done in bundles.rs This reverts commit 07e26362b74a836d84d8c988bc0169cc3c00d749. Signed-off-by: Ian Jackson --- src/progress.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/progress.rs b/src/progress.rs index 7d234c22..d395224c 100644 --- a/src/progress.rs +++ b/src/progress.rs @@ -155,14 +155,10 @@ impl Read for ReadOriginator<'_,R> { #[throws(io::Error)] fn read(&mut self, buf: &mut [u8]) -> usize { let got = self.r.read(buf)?; - if false { - // todo: this has a potential deadlock unless the client is concurrent - // todo: which it currently isn't, so disable it self.counter += got; if self.counter - self.last_report > 10000 { self.report(); } - } got } } -- 2.30.2