Resolve merge conflicts

Author: Sk7Str1p3

Cargo.lock

@@ -9,10 +9,10 @@ repository = "https://github.com/o2sh/onefetch"
 members = ["ascii", "image", "manifest"]
 
 [workspace.dependencies]
-owo-colors = "4.2.0"
+owo-colors = "4.2.1"
 anyhow = "1.0"
 clap = { version = "4.5.34", features = ["derive"] }
-image = { version = "0.25.5", default-features = false, features = [
+image = { version = "0.25.6", default-features = false, features = [
     "color_quant",
     "jpeg",
     "png",
@@ -65,16 +65,16 @@ serde_yaml = "0.9.34"
 # TODO With the new value parsers, we're really close to being able to eliminate
 # the strum dependency
 strum.workspace = true
-time = { version = "0.3.37", features = ["formatting"] }
+time = { version = "0.3.41", features = ["formatting"] }
 time-humanize = { version = "0.1.3", features = ["time"] }
 tokei = "13.0.0-alpha.8"
 toml = "0.8.22"
 typetag = "0.2"
 
 [dev-dependencies]
-criterion = "0.5.1"
+criterion = "0.6.0"
 gix-testtools = "0.16.1"
-insta = { version = "1.42.2", features = ["json", "redactions"] }
+insta = { version = "1.43.1", features = ["json", "redactions"] }
 rstest = "0.25.0"
 
 [[bench]]

Cargo.toml

@@ -151,7 +151,8 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
         &repo,
         cli_options.info.hide_token,
         cli_options.info.http_url,
-    )?;
+    )
+    .context("Failed to determine repository URL")?;
 
     let git_metrics = traverse_commit_graph(
         &repo,
@@ -161,7 +162,8 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
             .info
             .no_merges
             .unwrap_or(config_options.no_merges),
-    )?;
+    )
+    .context("Failed to traverse Git commit history")?;
     let true_color = match cli_options
         .ascii
         .true_color

src/info/mod.rs

@@ -37,10 +37,13 @@ impl<W: Write> Printer<W> {
         cli_options: CliOptions,
         config_options: ConfigOptions,
     ) -> Result<Self> {
-        let image = match cli_options.image.image {
-            Some(p) => Some(image::open(p).context("Could not load the specified image")?),
-            None => None,
-        };
+        let image =
+            match cli_options.image.image {
+                Some(p) => Some(image::open(&p).with_context(|| {
+                    format!("Could not load the image file at '{}'", p.display())
+                })?),
+                None => None,
+            };
 
         let image_backend = if image.is_some() {
             cli_options
@@ -92,7 +95,7 @@ impl<W: Write> Printer<W> {
                     let image_backend = self
                         .image_backend
                         .as_ref()
-                        .context("Could not detect a supported image backend")?;
+                        .context("No supported image backend detected on your system")?;
 
                     buf.push_str(
                         &image_backend
@@ -101,7 +104,7 @@ impl<W: Write> Printer<W> {
                                 custom_image,
                                 self.color_resolution,
                             )
-                            .context("Error while drawing image")?,
+                            .context("Failed to render the image in the terminal")?,
                     );
                 } else {
                     let mut logo_lines = if let Some(custom_ascii) = &self.ascii_input {