From aabb353d25313210679d9893aa0eafa6310f2155 Mon Sep 17 00:00:00 2001
From: daimond113 <72147841+daimond113@users.noreply.github.com>
Date: Sat, 28 Dec 2024 18:13:53 +0100
Subject: [PATCH] perf: lazily format error messages

---
 CHANGELOG.md                 |  2 ++
 src/cli/commands/outdated.rs |  2 +-
 src/cli/commands/publish.rs  | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fae6a40..63d9c95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Performance
 - Use `Arc` for more efficient cloning of multiple structs by @daimond113
 - Avoid cloning where possible by @daimond113
+- Remove unnecessary mutex in Wally package download by @daimond113
+- Lazily format error messages by @daimond113
 
 ## [0.5.2] - 2024-12-19
 ### Fixed
diff --git a/src/cli/commands/outdated.rs b/src/cli/commands/outdated.rs
index d036009..3edd7bf 100644
--- a/src/cli/commands/outdated.rs
+++ b/src/cli/commands/outdated.rs
@@ -96,7 +96,7 @@ impl OutdatedCommand {
                             .1
                             .pop_last()
                             .map(|(v_id, _)| v_id)
-                            .context(format!("no versions of {specifier} found"))?;
+                            .with_context(|| format!("no versions of {specifier} found"))?;
 
                         if version_id != current_version_id {
                             println!(
diff --git a/src/cli/commands/publish.rs b/src/cli/commands/publish.rs
index fbe9e2b..bb7f07a 100644
--- a/src/cli/commands/publish.rs
+++ b/src/cli/commands/publish.rs
@@ -224,7 +224,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
 
             let export_path = export_path
                 .canonicalize()
-                .context(format!("failed to canonicalize {name}"))?;
+                .with_context(|| format!("failed to canonicalize {name}"))?;
 
             if let Err(err) = full_moon::parse(&contents).map_err(|errs| {
                 errs.into_iter()
@@ -238,7 +238,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
             let first_part = relative_export_path
                 .components()
                 .next()
-                .context(format!("{name} must contain at least one part"))?;
+                .with_context(|| format!("{name} must contain at least one part"))?;
 
             let first_part = match first_part {
                 relative_path::Component::Normal(part) => part,
@@ -316,7 +316,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
 
                 let script_path = script_path
                     .canonicalize()
-                    .context(format!("failed to canonicalize script {name}"))?;
+                    .with_context(|| format!("failed to canonicalize script {name}"))?;
 
                 if let Err(err) = full_moon::parse(&contents).map_err(|errs| {
                     errs.into_iter()
@@ -365,7 +365,9 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
                         &relative_path,
                         fs::File::open(&path)
                             .await
-                            .context(format!("failed to read `{}`", relative_path.display()))?
+                            .with_context(|| {
+                                format!("failed to read `{}`", relative_path.display())
+                            })?
                             .file_mut(),
                     )
                     .await?;
@@ -391,7 +393,9 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
                         manifest
                             .indices
                             .get(&index_name)
-                            .context(format!("index {index_name} not found in indices field"))?
+                            .with_context(|| {
+                                format!("index {index_name} not found in indices field")
+                            })?
                             .to_string(),
                     );
                 }
@@ -406,9 +410,9 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
                         manifest
                             .wally_indices
                             .get(&index_name)
-                            .context(format!(
-                                "index {index_name} not found in wally_indices field"
-                            ))?
+                            .with_context(|| {
+                                format!("index {index_name} not found in wally_indices field")
+                            })?
                             .to_string(),
                     );
                 }
@@ -452,7 +456,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
                             }
                             VersionTypeOrReq::Req(r) => r,
                             v => VersionReq::parse(&format!("{v}{}", manifest.version))
-                                .context(format!("failed to parse version for {v}"))?,
+                                .with_context(|| format!("failed to parse version for {v}"))?,
                         },
                         index: Some(
                             manifest
@@ -589,7 +593,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
         let index_url = manifest
             .indices
             .get(&self.index)
-            .context(format!("missing index {}", self.index))?;
+            .with_context(|| format!("missing index {}", self.index))?;
         let source = PesdePackageSource::new(index_url.clone());
         refreshed_sources
             .refresh(