[git-odb] refactor

Author: Byron

git-odb/src/store/alternate/mod.rs renamed to git-odb/src/alternate/mod.rs

@@ -1,8 +1,8 @@
-use crate::store::alternate::unquote;
+use crate::alternate::unquote;
 use git_object::bstr::ByteSlice;
 use std::{borrow::Cow, path::PathBuf};
 
-/// Returned as part of [`crate::store::alternate::Error::Parse`]
+/// Returned as part of [`crate::alternate::Error::Parse`]
 #[derive(thiserror::Error, Debug)]
 #[allow(missing_docs)]
 pub enum Error {

git-odb/src/store/alternate/parse.rs renamed to git-odb/src/alternate/parse.rs

@@ -19,11 +19,14 @@
 //! * [`store::linked::Db`]
 //!   * A database containing various [`compound::Backends`][store::compound::Backend] as gathered from `alternates` files.
 pub use git_pack as pack;
-pub use pack::{data, Find, FindExt}; // TODO: leave it at 'git_odb::pack::data::Object` which is really what it is by now.
+pub use pack::{data, Find, FindExt};
+pub use write::Write;
+
+// TODO: leave it at 'git_odb::pack::data::Object` which is really what it is by now.
 
 ///
 pub mod store;
 
+pub mod alternate;
 ///
 pub mod write;
-pub use write::Write;

git-odb/src/store/alternate/unquote.rs renamed to git-odb/src/alternate/unquote.rs

@@ -14,7 +14,7 @@ pub enum Error {
     #[error(transparent)]
     Pack(#[from] pack::bundle::Error),
     #[error(transparent)]
-    Alternate(#[from] Box<crate::store::alternate::Error>),
+    Alternate(#[from] Box<crate::alternate::Error>),
 }
 
 /// Instantiation

git-odb/src/lib.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use crate::store::alternate;
+use crate::alternate;
 use crate::store::{compound, linked};
 
 /// The error returned by [`linked::Db::at()`]

git-odb/src/store/compound/init.rs

@@ -1,8 +1,8 @@
-pub mod alternate;
+pub use sink::{sink, Sink};
+
 pub mod compound;
 pub mod linked;
 pub mod loose;
 
 ///
 pub mod sink;
-pub use sink::{sink, Sink};

git-odb/src/store/linked/init.rs

@@ -1,4 +1,4 @@
-use git_odb::store::alternate;
+use git_odb::alternate;
 use std::{
     fs, io,
     path::{Path, PathBuf},

git-odb/src/store/mod.rs

@@ -6,4 +6,5 @@ pub fn hex_to_id(hex: &str) -> git_hash::ObjectId {
     git_hash::ObjectId::from_hex(hex.as_bytes()).expect("40 bytes hex")
 }
 
+pub mod alternate;
 pub mod store;

git-odb/tests/odb/store/alternate/mod.rs renamed to git-odb/tests/odb/alternate/mod.rs

@@ -57,8 +57,8 @@ mod init {
     use git_odb::store::linked;
     use std::convert::TryFrom;
 
+    use crate::odb::alternate::alternate;
     use crate::odb::store::linked::db;
-    use crate::store::alternate::alternate;
 
     #[test]
     fn multiple_linked_repositories_via_alternates() -> crate::Result {