Adapt to changes in gix-chunk

Author: Byron

Cargo.lock

@@ -66,7 +66,7 @@ impl Index {
             .ok_or_else(|| message!("The offsets into the file couldn't be represented by usize"))?])
     }
 
-    /// Return the end offset lf the last chunk, which is the highest offset as well.
+    /// Return the end offset of the last chunk, which is the highest offset as well.
     /// It's definitely available as we have one or more chunks.
     pub fn highest_offset(&self) -> crate::file::Offset {
         self.chunks.last().expect("at least one chunk").offset.end

gix-chunk/src/file/index.rs

@@ -22,6 +22,7 @@ serde = ["dep:serde", "gix-hash/serde", "bstr/serde"]
 [dependencies]
 gix-hash = { version = "^0.21.0", path = "../gix-hash" }
 gix-chunk = { version = "^0.4.12", path = "../gix-chunk" }
+gix-error = { version = "^0.0.0", path = "../gix-error" }
 
 bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 memmap2 = "0.9.7"

gix-commitgraph/Cargo.toml

@@ -1,6 +1,7 @@
 use std::path::{Path, PathBuf};
 
 use bstr::ByteSlice;
+use gix_error::message;
 
 use crate::{
     file::{
@@ -41,9 +42,9 @@ pub enum Error {
     #[error("Unsupported commit-graph file version: {0}")]
     UnsupportedVersion(u8),
     #[error(transparent)]
-    ChunkFileDecode(#[from] gix_chunk::file::decode::Error),
+    ChunkFileQuery(#[from] gix_error::Message),
     #[error(transparent)]
-    MissingChunk(#[from] gix_chunk::file::index::offset_by_kind::Error),
+    ChunkFileDecode(#[from] gix_error::ParseError),
     #[error("Commit-graph chunk {:?} has invalid size: {msg}", .id.as_bstr())]
     InvalidChunkSize { id: ChunkId, msg: String },
 }
@@ -194,9 +195,10 @@ impl File {
         }
 
         if base_graph_count > 0 && base_graphs_list_offset.is_none() {
-            return Err(gix_chunk::file::index::offset_by_kind::Error {
-                kind: BASE_GRAPHS_LIST_CHUNK_ID,
-            }
+            return Err(message!(
+                "Chunk named {:?} was not found in chunk file index",
+                BASE_GRAPHS_LIST_CHUNK_ID.as_bstr()
+            )
             .into());
         }
 

gix-commitgraph/src/file/init.rs

@@ -12,15 +12,17 @@
 //! # Standard Error Types
 //!
 //! These should always be used if they match the meaning of the error well enough instead of creating an own
-//! [`Error`](std::error::Error)-implementing type, and used with `Result|Option::or_raise(<StandardErrorType>)`.
+//! [`Error`](std::error::Error)-implementing type, and used with
+//! [`ResultExt::or_raise(<StandardErrorType>)`](ResultExt::or_raise) or
+//! [`OptionExt::ok_or_raise(<StandardErrorType>)`](OptionExt::ok_or_raise), or sibling methods.
 //!
 //! All these types implement [`Error`](std::error::Error).
 //!
 //! ## [`Message`]
 //!
 //! The baseline that provides a formatted message.
 //! Formatting can more easily be done with the [`message!`] macro as convenience, roughly equivalent to
-//! `Message(format!("…"))` or `format!("…").into()`.
+//! [`Message::new(format!("…"))`](Message::new) or `format!("…").into()`.
 //!
 //! ## Specialised types
 //!
@@ -30,7 +32,7 @@
 //! # [`Exn<ErrorType>`](Exn) and [`Exn`]
 //!
 //! The [`Exn`] type does not implement [`Error`](std::error::Error) itself, but is able to store causing errors
-//! via [`ResultExt::or_raise()`] (and friends) as well as location information of the creation site.
+//! via [`ResultExt::or_raise()`] (and sibling methods) as well as location information of the creation site.
 //!
 //! While plumbing functions that need to track causes should always return a distinct type like [`Exn<Message>`](Exn),
 //! if that's not possible, use [`Exn::erased`] to let it return `Result<T, Exn>` instead, allowing any return type.

gix-error/src/lib.rs

@@ -21,6 +21,8 @@ mod error {
         #[error("Unsupported hash kind: {kind})")]
         UnsupportedObjectHash { kind: u8 },
         #[error(transparent)]
+        ChunkFileQuery(#[from] gix_error::Message),
+        #[error(transparent)]
         ChunkFileDecode(#[from] gix_error::ParseError),
         #[error("The multi-pack fan doesn't have the correct size of 256 * 4 bytes")]
         MultiPackFanSize,