more context, less with_context

src/archive.rs

@@ -12,6 +12,10 @@ use std::convert::TryInto;
 use std::fs::{File, OpenOptions};
 use tar::Builder;
 
+/// These interfaces are similar to some methods in [tar::Builder].
+///
+/// They use [tokio::block_in_place] to avoid blocking other async
+/// tasks using the executor.
 #[async_trait]
 pub trait AsyncAppendFile {
     async fn append_file_async<P>(&mut self, path: P, file: &mut File) -> std::io::Result<()>
@@ -89,9 +93,7 @@ impl<E: Encoder> ArchiveBuilder<E> {
     }
 
     pub fn into_inner(self) -> Result<E> {
-        self.builder
-            .into_inner()
-            .with_context(|| "Finalizing archive")
+        self.builder.into_inner().context("Finalizing archive")
     }
 }
 

src/cache.rs

@@ -115,8 +115,8 @@ impl<D: FileDigester> ArtifactManifest<D> {
         if extension != "json" {
             bail!("JSON encoding is all we know. Write to a '.json' file?");
         }
-        let serialized = serde_json::to_string(&self)
-            .with_context(|| "Failed to serialize ArtifactManifest to JSON")?;
+        let serialized =
+            serde_json::to_string(&self).context("Failed to serialize ArtifactManifest to JSON")?;
 
         let mut f = File::create(path).await?;
         f.write_all(serialized.as_bytes()).await?;

src/package.rs

@@ -637,7 +637,7 @@ impl Package {
         let zoned = true;
         let inputs = self
             .get_all_inputs(name, target, output_directory, zoned, None)
-            .with_context(|| "Identifying all input paths")?;
+            .context("Identifying all input paths")?;
         progress.increment_total(inputs.0.len() as u64);
 
         let output_file = self.get_output_file(name);
@@ -657,7 +657,7 @@ impl Package {
                 progress.set_message("Cache miss".into());
             }
             Err(CacheError::Other(other)) => {
-                return Err(other).with_context(|| "Reading from package cache");
+                return Err(other).context("Reading from package cache");
             }
         }
 
@@ -680,7 +680,7 @@ impl Package {
         cache
             .update(&inputs, &output_path)
             .await
-            .with_context(|| "Updating package cache")?;
+            .context("Updating package cache")?;
 
         timer.finish()?;
         Ok(file)
@@ -779,7 +779,7 @@ impl Package {
         let zoned = false;
         let inputs = self
             .get_all_inputs(name, config.target, output_directory, zoned, None)
-            .with_context(|| "Identifying all input paths")?;
+            .context("Identifying all input paths")?;
         progress.increment_total(inputs.0.len() as u64);
 
         match cache.lookup(&inputs, &output_path).await {
@@ -791,7 +791,7 @@ impl Package {
                 progress.set_message("Cache miss".into());
             }
             Err(CacheError::Other(other)) => {
-                return Err(other).with_context(|| "Reading from package cache");
+                return Err(other).context("Reading from package cache");
             }
         }
 
@@ -814,7 +814,7 @@ impl Package {
         cache
             .update(&inputs, &output_path)
             .await
-            .with_context(|| "Updating package cache")?;
+            .context("Updating package cache")?;
 
         Ok(file)
     }

src/progress.rs

@@ -4,9 +4,9 @@
 
 //! Describes utilities for relaying progress to end-users.
 
-use std::sync::OnceLock;
 use slog::Logger;
 use std::borrow::Cow;
+use std::sync::OnceLock;
 
 /// Trait for propagating progress information while constructing the package.
 pub trait Progress {