adapt to changes in gix-object and gix-odb

Author: Byron

gitoxide-core/src/pack/explode.rs

@@ -9,7 +9,8 @@ use anyhow::{anyhow, Result};
 use gix::{
     hash::ObjectId,
     object, objs, odb,
-    odb::{loose, pack, Write},
+    odb::{loose, pack},
+    prelude::Write,
     NestedProgress,
 };
 
@@ -96,8 +97,8 @@ enum OutputWriter {
     Sink(odb::Sink),
 }
 
-impl gix::odb::Write for OutputWriter {
-    fn write_buf(&self, kind: object::Kind, from: &[u8]) -> Result<ObjectId, gix::odb::write::Error> {
+impl gix::objs::Write for OutputWriter {
+    fn write_buf(&self, kind: object::Kind, from: &[u8]) -> Result<ObjectId, gix::objs::write::Error> {
         match self {
             OutputWriter::Loose(db) => db.write_buf(kind, from),
             OutputWriter::Sink(db) => db.write_buf(kind, from),
@@ -109,7 +110,7 @@ impl gix::odb::Write for OutputWriter {
         kind: object::Kind,
         size: u64,
         from: &mut dyn Read,
-    ) -> Result<ObjectId, gix::odb::write::Error> {
+    ) -> Result<ObjectId, gix::objs::write::Error> {
         match self {
             OutputWriter::Loose(db) => db.write_stream(kind, size, from),
             OutputWriter::Sink(db) => db.write_stream(kind, size, from),

gix-object/src/traits/mod.rs

@@ -4,18 +4,18 @@ use crate::Kind;
 
 /// Describe the capability to write git objects into an object store.
 pub trait Write {
-    /// Write objects using the intrinsic kind of [`hash`][gix_hash::Kind] into the database,
+    /// Write objects using the intrinsic kind of [`hash`](gix_hash::Kind) into the database,
     /// returning id to reference it in subsequent reads.
     fn write(&self, object: &dyn WriteTo) -> Result<gix_hash::ObjectId, crate::write::Error> {
         let mut buf = Vec::with_capacity(2048);
         object.write_to(&mut buf)?;
         self.write_stream(object.kind(), buf.len() as u64, &mut buf.as_slice())
     }
-    /// As [`write`][Write::write], but takes an [`object` kind][gix_object::Kind] along with its encoded bytes.
+    /// As [`write`](Write::write), but takes an [`object` kind](Kind) along with its encoded bytes.
     fn write_buf(&self, object: crate::Kind, mut from: &[u8]) -> Result<gix_hash::ObjectId, crate::write::Error> {
         self.write_stream(object, from.len() as u64, &mut from)
     }
-    /// As [`write`][Write::write], but takes an input stream.
+    /// As [`write`](Write::write), but takes an input stream.
     /// This is commonly used for writing blobs directly without reading them to memory first.
     fn write_stream(
         &self,

gix-odb/src/store_impls/dynamic/write.rs

@@ -8,7 +8,7 @@ use crate::store;
 mod error {
     use crate::{loose, store};
 
-    /// The error returned by the [dynamic Store's][crate::Store] [`Write`][crate::Write] implementation.
+    /// The error returned by the [dynamic Store's][crate::Store] [`Write`](gix_object::Write) implementation.
     #[derive(Debug, thiserror::Error)]
     #[allow(missing_docs)]
     pub enum Error {

gix-odb/src/store_impls/loose/write.rs

@@ -7,7 +7,7 @@ use tempfile::NamedTempFile;
 use super::Store;
 use crate::store_impls::loose;
 
-/// Returned by the [`crate::Write`] trait implementation of [`Store`]
+/// Returned by the [`gix_object::Write`] trait implementation of [`Store`]
 #[derive(thiserror::Error, Debug)]
 #[allow(missing_docs)]
 pub enum Error {

gix/src/prelude.rs

@@ -1,5 +1,5 @@
 pub use gix_features::parallel::reduce::Finalize;
-pub use gix_object::{Find, FindExt};
-pub use gix_odb::{Header, HeaderExt, Write};
+pub use gix_object::{Find, FindExt, Write};
+pub use gix_odb::{Header, HeaderExt};
 
 pub use crate::ext::*;

gix/src/repository/object.rs

@@ -2,8 +2,8 @@
 use std::ops::DerefMut;
 
 use gix_hash::ObjectId;
-use gix_object::{Exists, Find, FindExt};
-use gix_odb::{Header, HeaderExt, Write};
+use gix_object::{Exists, Find, FindExt, Write};
+use gix_odb::{Header, HeaderExt};
 use gix_ref::{
     transaction::{LogChange, PreviousValue, RefLog},
     FullName,