fix(installations): correct faulty output when interleaving a installation with a download

Author: FranciscoTGouveia

src/dist/download.rs

@@ -272,7 +272,6 @@ impl DownloadStatus {
             ProgressStyle::with_template("{msg:>12.bold}  downloaded {total_bytes} in {elapsed}")
                 .unwrap(),
         );
-        self.progress.finish();
     }
 
     pub(crate) fn failed(&self) {
@@ -288,6 +287,25 @@ impl DownloadStatus {
         self.progress
             .set_style(ProgressStyle::with_template("{msg:>12.bold}  retrying download").unwrap());
     }
+
+    pub(crate) fn installing(&self) {
+        self.progress.set_style(
+            ProgressStyle::with_template(
+                "{msg:>12.bold}  downloaded {total_bytes} in {elapsed} installing now {spinner:.green}",
+            )
+            .unwrap()
+            .tick_chars(r"|/-\ "),
+        );
+        self.progress.enable_steady_tick(Duration::from_millis(100));
+    }
+
+    pub(crate) fn installed(&self) {
+        self.progress.set_style(
+            ProgressStyle::with_template("{msg:>12.bold}  downloaded {total_bytes} and installed")
+                .unwrap(),
+        );
+        self.progress.finish();
+    }
 }
 
 fn file_hash(path: &Path) -> Result<String> {

src/dist/manifestation.rs

@@ -517,17 +517,7 @@ impl Manifestation {
         let short_pkg_name = component_bin.component.short_name_in_manifest();
         let short_name = component_bin.component.short_name(new_manifest);
 
-        match &component_bin.component.target {
-            Some(t) if t != &self.target_triple => {
-                info!("installing component {short_name}");
-            }
-            _ => {
-                info!(
-                    "installing component {short_name} for target {}",
-                    self.target_triple
-                )
-            }
-        }
+        component_bin.status.installing();
 
         let reader = utils::FileReaderWithProgress::new_file(&installer_file)?;
         let package = match component_bin.binary.compression {
@@ -542,7 +532,9 @@ impl Manifestation {
             return Err(RustupError::CorruptComponent(short_name).into());
         }
 
-        package.install(&self.installation, &pkg_name, Some(short_pkg_name), tx)
+        let tx = package.install(&self.installation, &pkg_name, Some(short_pkg_name), tx);
+        component_bin.status.installed();
+        tx
     }
 }