dist: hoist creation of io_executor some more

Author: djc

src/dist/component/package.rs

@@ -12,12 +12,9 @@ use anyhow::{Context, Result, anyhow, bail};
 use tar::EntryType;
 use tracing::warn;
 
-use crate::diskio::{
-    CompletedIo, Executor, FileBuffer, IO_CHUNK_SIZE, Item, Kind, get_executor, unpack_ram,
-};
+use crate::diskio::{CompletedIo, Executor, FileBuffer, IO_CHUNK_SIZE, Item, Kind};
 use crate::dist::component::components::{ComponentPart, ComponentPartKind, Components};
 use crate::dist::component::transaction::Transaction;
-use crate::dist::download::DownloadCfg;
 use crate::dist::manifest::CompressionKind;
 use crate::dist::temp;
 use crate::errors::RustupError;
@@ -38,33 +35,36 @@ impl DirectoryPackage<temp::Dir> {
     pub(crate) fn compressed<R: Read>(
         stream: R,
         kind: CompressionKind,
-        dl_cfg: &DownloadCfg<'_>,
+        temp_dir: temp::Dir,
+        io_executor: Box<dyn Executor>,
     ) -> Result<Self> {
         match kind {
-            CompressionKind::GZip => Self::from_tar(flate2::read::GzDecoder::new(stream), dl_cfg),
-            CompressionKind::ZStd => {
-                Self::from_tar(zstd::stream::read::Decoder::new(stream)?, dl_cfg)
+            CompressionKind::GZip => {
+                Self::from_tar(flate2::read::GzDecoder::new(stream), temp_dir, io_executor)
+            }
+            CompressionKind::ZStd => Self::from_tar(
+                zstd::stream::read::Decoder::new(stream)?,
+                temp_dir,
+                io_executor,
+            ),
+            CompressionKind::XZ => {
+                Self::from_tar(xz2::read::XzDecoder::new(stream), temp_dir, io_executor)
             }
-            CompressionKind::XZ => Self::from_tar(xz2::read::XzDecoder::new(stream), dl_cfg),
         }
     }
 
-    fn from_tar(stream: impl Read, dl_cfg: &DownloadCfg<'_>) -> Result<Self> {
-        let temp_dir = dl_cfg.tmp_cx.new_directory()?;
+    fn from_tar(
+        stream: impl Read,
+        temp_dir: temp::Dir,
+        io_executor: Box<dyn Executor>,
+    ) -> Result<Self> {
         let mut archive = tar::Archive::new(stream);
 
         // The rust-installer packages unpack to a directory called
         // $pkgname-$version-$target. Skip that directory when
         // unpacking.
-        unpack_without_first_dir(
-            &mut archive,
-            &temp_dir,
-            get_executor(
-                unpack_ram(IO_CHUNK_SIZE, dl_cfg.process.unpack_ram()?),
-                dl_cfg.process.io_thread_count()?,
-            ),
-        )
-        .context("failed to extract package")?;
+        unpack_without_first_dir(&mut archive, &temp_dir, io_executor)
+            .context("failed to extract package")?;
 
         Self::new(temp_dir, false)
     }

src/dist/manifestation.rs

@@ -10,6 +10,7 @@ use anyhow::{Context, Result, anyhow, bail};
 use futures_util::stream::{FuturesUnordered, StreamExt};
 use tracing::{info, warn};
 
+use crate::diskio::{IO_CHUNK_SIZE, get_executor, unpack_ram};
 use crate::dist::component::{Components, DirectoryPackage, Transaction};
 use crate::dist::config::Config;
 use crate::dist::download::{DownloadCfg, DownloadStatus, File};
@@ -423,7 +424,13 @@ impl Manifestation {
 
         // Install all the components in the installer
         let reader = utils::FileReaderWithProgress::new_file(&installer_file)?;
-        let package = DirectoryPackage::compressed(reader, CompressionKind::GZip, dl_cfg)?;
+        let temp_dir = dl_cfg.tmp_cx.new_directory()?;
+        let io_executor = get_executor(
+            unpack_ram(IO_CHUNK_SIZE, dl_cfg.process.unpack_ram()?),
+            dl_cfg.process.io_thread_count()?,
+        );
+        let package =
+            DirectoryPackage::compressed(reader, CompressionKind::GZip, temp_dir, io_executor)?;
         for component in package.components() {
             tx = package.install(&self.installation, &component, None, tx)?;
         }
@@ -687,8 +694,13 @@ impl<'a> ComponentBinary<'a> {
         self.status.installing();
 
         let reader = utils::FileReaderWithProgress::new_file(&installer_file)?;
+        let temp_dir = self.download_cfg.tmp_cx.new_directory()?;
+        let io_executor = get_executor(
+            unpack_ram(IO_CHUNK_SIZE, self.download_cfg.process.unpack_ram()?),
+            self.download_cfg.process.io_thread_count()?,
+        );
         let package =
-            DirectoryPackage::compressed(reader, self.binary.compression, self.download_cfg)?;
+            DirectoryPackage::compressed(reader, self.binary.compression, temp_dir, io_executor)?;
 
         // If the package doesn't contain the component that the
         // manifest says it does then somebody must be playing a joke on us.