Merge pull request #2378 from GitoxideLabs/gix-error

`gix-commitgraph` to `gix-error`

Author: Byron

Cargo.lock

@@ -22,10 +22,10 @@ impl Default for Context<Vec<u8>, Vec<u8>> {
 pub(crate) mod function {
     use std::{io, path::Path};
 
-    use anyhow::{Context as AnyhowContext, Result};
-    use gix::commitgraph::{verify::Outcome, Graph};
-
     use crate::OutputFormat;
+    use anyhow::Result;
+    use gix::commitgraph::{verify::Outcome, Graph};
+    use gix::Exn;
 
     pub fn verify<W1, W2>(
         path: impl AsRef<Path>,
@@ -34,20 +34,18 @@ pub(crate) mod function {
             mut out,
             output_statistics,
         }: super::Context<W1, W2>,
-    ) -> Result<gix::commitgraph::verify::Outcome>
+    ) -> Result<Outcome>
     where
         W1: io::Write,
         W2: io::Write,
     {
-        let g = Graph::at(path.as_ref()).with_context(|| "Could not open commit graph")?;
+        let g = Graph::at(path.as_ref()).map_err(Exn::into_error)?;
 
         #[allow(clippy::unnecessary_wraps, unknown_lints)]
         fn noop_processor(_commit: &gix::commitgraph::file::Commit<'_>) -> std::result::Result<(), std::fmt::Error> {
             Ok(())
         }
-        let stats = g
-            .verify_integrity(noop_processor)
-            .with_context(|| "Verification failure")?;
+        let stats = g.verify_integrity(noop_processor).map_err(Exn::into_error)?;
 
         #[cfg_attr(not(feature = "serde"), allow(clippy::single_match))]
         match output_statistics {

gitoxide-core/src/commitgraph/verify.rs

@@ -12,9 +12,9 @@ pub struct Context<W1: std::io::Write, W2: std::io::Write> {
 pub(crate) mod function {
     use std::io;
 
-    use anyhow::{Context as AnyhowContext, Result};
-
     use crate::{repository::commitgraph::verify::Context, OutputFormat};
+    use anyhow::Result;
+    use gix::Exn;
 
     pub fn verify<W1, W2>(
         repo: gix::Repository,
@@ -34,9 +34,7 @@ pub(crate) mod function {
         fn noop_processor(_commit: &gix::commitgraph::file::Commit<'_>) -> std::result::Result<(), std::fmt::Error> {
             Ok(())
         }
-        let stats = g
-            .verify_integrity(noop_processor)
-            .with_context(|| "Verification failure")?;
+        let stats = g.verify_integrity(noop_processor).map_err(Exn::into_error)?;
 
         #[cfg_attr(not(feature = "serde"), allow(clippy::single_match))]
         match output_statistics {

gitoxide-core/src/repository/commitgraph/verify.rs

@@ -16,6 +16,7 @@ rust-version = "1.82"
 blob-experimental = ["gix-diff/blob-experimental"]
 
 [dependencies]
+gix-error = { version = "0.0.0", path = "../gix-error" }
 gix-commitgraph = { version = "^0.31.0", path = "../gix-commitgraph" }
 gix-revwalk = { version = "^0.25.0", path = "../gix-revwalk" }
 gix-trace = { version = "^0.1.17", path = "../gix-trace" }

gix-blame/Cargo.toml

@@ -34,5 +34,5 @@ pub enum Error {
     #[error("Failure to decode commit during traversal")]
     DecodeCommit(#[from] gix_object::decode::Error),
     #[error("Failed to get parent from commitgraph during traversal")]
-    GetParentFromCommitGraph(#[from] gix_commitgraph::file::commit::Error),
+    GetParentFromCommitGraph(#[from] gix_error::Message),
 }

gix-blame/src/error.rs

@@ -63,7 +63,7 @@ impl Index {
     pub fn data_by_id<'a>(&self, data: &'a [u8], kind: Id) -> Result<&'a [u8], Message> {
         let offset = self.offset_by_id(kind)?;
         Ok(&data[crate::range::into_usize(offset)
-            .ok_or_else(|| message!("The offsets into the file couldn't be represented by usize"))?])
+            .ok_or_else(|| message("The offsets into the file couldn't be represented by usize"))?])
     }
 
     /// Return the end offset of the last chunk, which is the highest offset as well.

gix-chunk/src/file/index.rs

@@ -27,7 +27,6 @@ gix-error = { version = "^0.0.0", path = "../gix-error" }
 bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 memmap2 = "0.9.7"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
-thiserror = "2.0.17"
 
 document-features = { version = "0.2.0", optional = true }
 

gix-commitgraph/Cargo.toml

@@ -11,7 +11,7 @@ fn fuzz(data: &[u8]) -> Result<()> {
         d.copy_from_slice(data);
         d.make_read_only()?
     };
-    let file = File::new(data, "does not matter".into())?;
+    let file = File::new(data, "does not matter".into()).map_err(|e| e.into_inner())?;
 
     _ = black_box(file.iter_base_graph_ids().count());
     _ = black_box(file.iter_commits().count());

gix-commitgraph/fuzz/fuzz_targets/fuzz_file.rs

@@ -1,27 +1,13 @@
 //! Low-level operations on individual commits.
-use std::{
-    fmt::{Debug, Formatter},
-    slice::Chunks,
-};
-
 use crate::{
     file::{self, EXTENDED_EDGES_MASK, LAST_EXTENDED_EDGE_MASK, NO_PARENT},
     File, Position,
 };
-
-/// The error used in the [`file::commit`][self] module.
-#[derive(thiserror::Error, Debug)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error("commit {0}'s extra edges overflows the commit-graph file's extra edges list")]
-    ExtraEdgesListOverflow(gix_hash::ObjectId),
-    #[error("commit {0}'s first parent is an extra edge index, which is invalid")]
-    FirstParentIsExtraEdgeIndex(gix_hash::ObjectId),
-    #[error("commit {0} has extra edges, but commit-graph file has no extra edges list")]
-    MissingExtraEdgesList(gix_hash::ObjectId),
-    #[error("commit {0} has a second parent but not a first parent")]
-    SecondParentWithoutFirstParent(gix_hash::ObjectId),
-}
+use gix_error::{message, Message};
+use std::{
+    fmt::{Debug, Formatter},
+    slice::Chunks,
+};
 
 /// A commit as stored in a [`File`].
 #[derive(Copy, Clone)]
@@ -91,7 +77,7 @@ impl<'a> Commit<'a> {
     }
 
     /// Returns the first parent of this commit.
-    pub fn parent1(&self) -> Result<Option<Position>, Error> {
+    pub fn parent1(&self) -> Result<Option<Position>, Message> {
         self.iter_parents().next().transpose()
     }
 
@@ -136,23 +122,27 @@ pub struct Parents<'a> {
 }
 
 impl Iterator for Parents<'_> {
-    type Item = Result<Position, Error>;
+    type Item = Result<Position, Message>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let state = std::mem::replace(&mut self.state, ParentIteratorState::Exhausted);
         match state {
             ParentIteratorState::First => match self.commit_data.parent1 {
                 ParentEdge::None => match self.commit_data.parent2 {
                     ParentEdge::None => None,
-                    _ => Some(Err(Error::SecondParentWithoutFirstParent(self.commit_data.id().into()))),
+                    _ => Some(Err(message!(
+                        "commit {} has a second parent but not a first parent",
+                        self.commit_data.id()
+                    ))),
                 },
                 ParentEdge::GraphPosition(pos) => {
                     self.state = ParentIteratorState::Second;
                     Some(Ok(pos))
                 }
-                ParentEdge::ExtraEdgeIndex(_) => {
-                    Some(Err(Error::FirstParentIsExtraEdgeIndex(self.commit_data.id().into())))
-                }
+                ParentEdge::ExtraEdgeIndex(_) => Some(Err(message!(
+                    "commit {}'s first parent is an extra edge index, which is invalid",
+                    self.commit_data.id(),
+                ))),
             },
             ParentIteratorState::Second => match self.commit_data.parent2 {
                 ParentEdge::None => None,
@@ -171,10 +161,16 @@ impl Iterator for Parents<'_> {
                             // with a std::iter::from_fn closure.
                             self.next()
                         } else {
-                            Some(Err(Error::ExtraEdgesListOverflow(self.commit_data.id().into())))
+                            Some(Err(message!(
+                                "commit {0}'s extra edges overflows the commit-graph file's extra edges list",
+                                self.commit_data.id()
+                            )))
                         }
                     } else {
-                        Some(Err(Error::MissingExtraEdgesList(self.commit_data.id().into())))
+                        Some(Err(message!(
+                            "commit {} has extra edges, but commit-graph file has no extra edges list",
+                            self.commit_data.id()
+                        )))
                     }
                 }
             },
@@ -189,7 +185,10 @@ impl Iterator for Parents<'_> {
                         ExtraEdge::Last(pos) => Some(Ok(pos)),
                     }
                 } else {
-                    Some(Err(Error::ExtraEdgesListOverflow(self.commit_data.id().into())))
+                    Some(Err(message!(
+                        "commit {}'s extra edges overflows the commit-graph file's extra edges list",
+                        self.commit_data.id()
+                    )))
                 }
             }
             ParentIteratorState::Exhausted => None,