Externalize wrapping of DownloadTracker

Author: djc

src/cli/common.rs

@@ -133,7 +133,9 @@ pub(super) struct Notifier {
 impl Notifier {
     pub(super) fn new(verbose: bool, quiet: bool) -> Self {
         Self {
-            tracker: DownloadTracker::new_with_display_progress(!quiet),
+            tracker: Arc::new(Mutex::new(DownloadTracker::new_with_display_progress(
+                !quiet,
+            ))),
             ram_notice_shown: RefCell::new(false),
             verbose,
         }

src/cli/download_tracker.rs

@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 use std::fmt;
 use std::io::Write;
-use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use crate::currentprocess::{process, terminalsource};
@@ -50,8 +49,8 @@ pub(crate) struct DownloadTracker {
 
 impl DownloadTracker {
     /// Creates a new DownloadTracker.
-    pub(crate) fn new_with_display_progress(display_progress: bool) -> Arc<Mutex<Self>> {
-        Arc::new(Mutex::new(Self {
+    pub(crate) fn new_with_display_progress(display_progress: bool) -> Self {
+        Self {
             content_len: None,
             total_downloaded: 0,
             downloaded_this_sec: 0,
@@ -62,7 +61,7 @@ impl DownloadTracker {
             displayed_charcount: None,
             units: vec![Unit::B],
             display_progress,
-        }))
+        }
     }
 
     pub(crate) fn handle_notification(&mut self, n: &Notification<'_>) -> bool {

src/cli/self_update/windows.rs

@@ -5,6 +5,7 @@ use std::io::Write;
 use std::os::windows::ffi::{OsStrExt, OsStringExt};
 use std::path::Path;
 use std::process::Command;
+use std::sync::{Arc, Mutex};
 
 use anyhow::{anyhow, Context, Result};
 
@@ -179,7 +180,7 @@ pub(crate) async fn try_install_msvc(opts: &InstallOpts<'_>) -> Result<ContinueI
         .context("error creating temp directory")?;
 
     let visual_studio = tempdir.path().join("vs_setup.exe");
-    let download_tracker = DownloadTracker::new_with_display_progress(true);
+    let download_tracker = Arc::new(Mutex::new(DownloadTracker::new_with_display_progress(true)));
     download_tracker.lock().unwrap().download_finished();
 
     info!("downloading Visual Studio installer");