dist: store owned temp::Context in Transaction

Author: djc

src/dist/component/components.rs

@@ -54,7 +54,7 @@ impl Components {
             Ok(None)
         }
     }
-    fn write_version(&self, tx: &mut Transaction<'_>) -> Result<()> {
+    fn write_version(&self, tx: &mut Transaction) -> Result<()> {
         tx.modify_file(self.prefix.rel_manifest_file(VERSION_FILE))?;
         utils::write_file(
             VERSION_FILE,
@@ -78,7 +78,7 @@ impl Components {
             })
             .collect())
     }
-    pub(crate) fn add<'a>(&self, name: &str, tx: Transaction<'a>) -> ComponentBuilder<'a> {
+    pub(crate) fn add(&self, name: &str, tx: Transaction) -> ComponentBuilder {
         ComponentBuilder {
             components: self.clone(),
             name: name.to_owned(),
@@ -95,14 +95,14 @@ impl Components {
     }
 }
 
-pub(crate) struct ComponentBuilder<'a> {
+pub(crate) struct ComponentBuilder {
     components: Components,
     name: String,
     parts: Vec<ComponentPart>,
-    tx: Transaction<'a>,
+    tx: Transaction,
 }
 
-impl<'a> ComponentBuilder<'a> {
+impl ComponentBuilder {
     pub(crate) fn copy_file(&mut self, path: PathBuf, src: &Path) -> Result<()> {
         self.parts.push(ComponentPart {
             kind: ComponentPartKind::File,
@@ -131,7 +131,7 @@ impl<'a> ComponentBuilder<'a> {
         });
         self.tx.move_dir(&self.name, path, src)
     }
-    pub(crate) fn finish(mut self) -> Result<Transaction<'a>> {
+    pub(crate) fn finish(mut self) -> Result<Transaction> {
         // Write component manifest
         let path = self.components.rel_component_manifest(&self.name);
         let abs_path = self.components.prefix.abs_path(&path);
@@ -254,7 +254,7 @@ impl Component {
         }
         Ok(result)
     }
-    pub fn uninstall<'a>(&self, mut tx: Transaction<'a>) -> Result<Transaction<'a>> {
+    pub fn uninstall(&self, mut tx: Transaction) -> Result<Transaction> {
         // Update components file
         let path = self.components.rel_components_file();
         let abs_path = self.components.prefix.abs_path(&path);

src/dist/component/package.rs

@@ -96,13 +96,13 @@ impl<P: Deref<Target = Path>> DirectoryPackage<P> {
             }
     }
 
-    pub fn install<'a>(
+    pub fn install(
         &self,
         target: &Components,
         name: &str,
         short_name: Option<&str>,
-        tx: Transaction<'a>,
-    ) -> Result<Transaction<'a>> {
+        tx: Transaction,
+    ) -> Result<Transaction> {
         let actual_name = if self.components.contains(name) {
             name
         } else if let Some(n) = short_name {

src/dist/component/transaction.rs

@@ -11,6 +11,7 @@
 
 use std::fs::File;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use anyhow::{Context, Result, anyhow};
 use tracing::{error, info};
@@ -33,16 +34,20 @@ use crate::utils;
 ///
 /// All operations that create files will fail if the destination
 /// already exists.
-pub struct Transaction<'a> {
+pub struct Transaction {
     prefix: InstallPrefix,
     changes: Vec<ChangedItem>,
-    tmp_cx: &'a temp::Context,
+    tmp_cx: Arc<temp::Context>,
     committed: bool,
     pub(super) permit_copy_rename: bool,
 }
 
-impl<'a> Transaction<'a> {
-    pub fn new(prefix: InstallPrefix, tmp_cx: &'a temp::Context, permit_copy_rename: bool) -> Self {
+impl Transaction {
+    pub fn new(
+        prefix: InstallPrefix,
+        tmp_cx: Arc<temp::Context>,
+        permit_copy_rename: bool,
+    ) -> Self {
         Transaction {
             prefix,
             changes: Vec::new(),
@@ -189,14 +194,14 @@ impl<'a> Transaction<'a> {
         Ok(())
     }
 
-    pub(crate) fn temp(&self) -> &'a temp::Context {
-        self.tmp_cx
+    pub(crate) fn temp(&self) -> &temp::Context {
+        &self.tmp_cx
     }
 }
 
 /// If a Transaction is dropped without being committed, the changes
 /// are automatically rolled back.
-impl Drop for Transaction<'_> {
+impl Drop for Transaction {
     fn drop(&mut self) {
         if !self.committed {
             info!("rolling back changes");

src/dist/manifestation.rs

@@ -5,6 +5,8 @@
 mod tests;
 
 use std::path::Path;
+#[cfg(test)]
+use std::sync::Arc;
 
 use anyhow::{Context, Result, anyhow, bail};
 use futures_util::stream::{FuturesUnordered, StreamExt};
@@ -171,7 +173,7 @@ impl Manifestation {
         // Begin transaction
         let mut tx = Transaction::new(
             prefix.clone(),
-            &download_cfg.tmp_cx,
+            download_cfg.tmp_cx.clone(),
             download_cfg.permit_copy_rename,
         );
 
@@ -265,7 +267,7 @@ impl Manifestation {
     pub(crate) fn uninstall(
         &self,
         manifest: &Manifest,
-        tmp_cx: &temp::Context,
+        tmp_cx: Arc<temp::Context>,
         permit_copy_rename: bool,
     ) -> Result<()> {
         let prefix = self.installation.prefix();
@@ -290,12 +292,12 @@ impl Manifestation {
         Ok(())
     }
 
-    fn uninstall_component<'a>(
+    fn uninstall_component(
         &self,
         component: Component,
         manifest: &Manifest,
-        mut tx: Transaction<'a>,
-    ) -> Result<Transaction<'a>> {
+        mut tx: Transaction,
+    ) -> Result<Transaction> {
         // For historical reasons, the rust-installer component
         // names are not the same as the dist manifest component
         // names. Some are just the component name some are the
@@ -393,7 +395,7 @@ impl Manifestation {
         info!("installing component rust");
 
         // Begin transaction
-        let mut tx = Transaction::new(prefix, &dl_cfg.tmp_cx, dl_cfg.permit_copy_rename);
+        let mut tx = Transaction::new(prefix, dl_cfg.tmp_cx.clone(), dl_cfg.permit_copy_rename);
 
         // Uninstall components
         let components = self.installation.list()?;
@@ -424,11 +426,11 @@ impl Manifestation {
     // doesn't have a configuration or manifest-derived list of
     // component/target pairs. Uninstall it using the installer's
     // component list before upgrading.
-    fn maybe_handle_v2_upgrade<'a>(
+    fn maybe_handle_v2_upgrade(
         &self,
         config: &Option<Config>,
-        mut tx: Transaction<'a>,
-    ) -> Result<Transaction<'a>> {
+        mut tx: Transaction,
+    ) -> Result<Transaction> {
         let installed_components = self.installation.list()?;
         let looks_like_v1 = config.is_none() && !installed_components.is_empty();
 
@@ -674,12 +676,12 @@ impl<'a> ComponentBinary<'a> {
         Ok((self, downloaded_file))
     }
 
-    fn install<'t>(
+    fn install(
         self,
         installer_file: File,
-        tx: Transaction<'t>,
+        tx: Transaction,
         manifestation: &Manifestation,
-    ) -> Result<Transaction<'t>> {
+    ) -> Result<Transaction> {
         // For historical reasons, the rust-installer component
         // names are not the same as the dist manifest component
         // names. Some are just the component name some are the

src/dist/manifestation/tests.rs

@@ -527,7 +527,7 @@ impl TestContext {
 
         manifestation.uninstall(
             &manifest,
-            &self.tmp_cx,
+            self.tmp_cx.clone(),
             self.tp.process.permit_copy_rename(),
         )?;
 

src/test/dist.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 use std::fs::{self, File};
 use std::io::{self, Read, Write};
 use std::path::{Path, PathBuf};
-use std::sync::{LazyLock, Mutex};
+use std::sync::{Arc, LazyLock, Mutex};
 
 use url::Url;
 
@@ -29,7 +29,7 @@ pub struct DistContext {
     pub inst_dir: tempfile::TempDir,
     pub prefix: InstallPrefix,
     _tmp_dir: tempfile::TempDir,
-    pub cx: temp::Context,
+    pub cx: Arc<temp::Context>,
     pub tp: TestProcess,
 }
 
@@ -48,23 +48,26 @@ impl DistContext {
             pkg_dir,
             inst_dir,
             prefix,
-            cx: temp::Context::new(tmp_dir.path().to_owned(), DEFAULT_DIST_SERVER),
+            cx: Arc::new(temp::Context::new(
+                tmp_dir.path().to_owned(),
+                DEFAULT_DIST_SERVER,
+            )),
             tp: TestProcess::default(),
             _tmp_dir: tmp_dir,
         })
     }
 
-    pub fn start(&self) -> anyhow::Result<(Transaction<'_>, Components, DirectoryPackage<&Path>)> {
+    pub fn start(&self) -> anyhow::Result<(Transaction, Components, DirectoryPackage<&Path>)> {
         let tx = self.transaction();
         let components = Components::open(self.prefix.clone())?;
         let pkg = DirectoryPackage::new(self.pkg_dir.path(), true)?;
         Ok((tx, components, pkg))
     }
 
-    pub fn transaction(&self) -> Transaction<'_> {
+    pub fn transaction(&self) -> Transaction {
         Transaction::new(
             self.prefix.clone(),
-            &self.cx,
+            self.cx.clone(),
             self.tp.process.permit_copy_rename(),
         )
     }

tests/suite/dist_install.rs

@@ -169,7 +169,7 @@ fn uninstall() {
     // Now uninstall
     let mut tx = Transaction::new(
         cx.prefix.clone(),
-        &cx.cx,
+        cx.cx.clone(),
         cx.tp.process.permit_copy_rename(),
     );
     for component in components.list().unwrap() {