[commitgraph] refactor

Author: Byron

git-commitgraph/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "git-commitgraph"
 version = "0.0.0"
-repository = "https://github.com/Byron/git-oxide"
+repository = "https://github.com/Byron/gitxoxide"
 documentation = "https://git-scm.com/docs/commit-graph#:~:text=The%20commit-graph%20file%20is%20a%20supplemental%20data%20structure,or%20in%20the%20info%20directory%20of%20an%20alternate."
 license = "MIT/Apache-2.0"
-description = "A WIP crate of the gitoxide project dedicated implementing the git commitgraph file format and its maintenance"
-authors = ["Sebastian Thiel <[email protected]>", "Conor Davis <[email protected]>"]
+description = "A crate of the gitoxide project dedicated implementing the git commitgraph file format and its maintenance"
+authors = ["Conor Davis <[email protected]>", "Sebastian Thiel <[email protected]>"]
 edition = "2018"
 
 [lib]

git-commitgraph/tests/access/mod.rs

@@ -2,7 +2,7 @@ use crate::{check_common, create_repo, inspect_refs};
 use git_commitgraph::Graph;
 
 #[test]
-fn single_parent() -> Result<(), Box<dyn std::error::Error>> {
+fn single_parent() -> crate::Result {
     let repo_dir = create_repo("single_parent.sh");
     let refs = inspect_refs(repo_dir.path(), &["parent", "child"]);
     let cg = Graph::from_info_dir(repo_dir.path().join(".git").join("objects").join("info"))?;
@@ -15,7 +15,7 @@ fn single_parent() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn octupus_merges() -> Result<(), Box<dyn std::error::Error>> {
+fn octupus_merges() -> crate::Result {
     let repo_dir = create_repo("octopus_merges.sh");
     let refs = inspect_refs(
         repo_dir.path(),
@@ -44,7 +44,7 @@ fn octupus_merges() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn single_commit() -> Result<(), Box<dyn std::error::Error>> {
+fn single_commit() -> crate::Result {
     let repo_dir = create_repo("single_commit.sh");
     let refs = inspect_refs(repo_dir.path(), &["commit"]);
     let cg = Graph::from_info_dir(repo_dir.path().join(".git").join("objects").join("info"))?;
@@ -56,7 +56,7 @@ fn single_commit() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn two_parents() -> Result<(), Box<dyn std::error::Error>> {
+fn two_parents() -> crate::Result {
     let repo_dir = create_repo("two_parents.sh");
     let refs = inspect_refs(repo_dir.path(), &["parent1", "parent2", "child"]);
     let cg = Graph::from_info_dir(repo_dir.path().join(".git").join("objects").join("info"))?;

git-commitgraph/tests/commitgraph.rs

@@ -9,6 +9,8 @@ use std::{
     process::Command,
 };
 
+type Result = std::result::Result<(), Box<dyn std::error::Error>>;
+
 mod access;
 
 pub fn check_common(cg: &Graph, expected: &HashMap<String, RefInfo, impl BuildHasher>) {
@@ -35,6 +37,7 @@ pub fn check_common(cg: &Graph, expected: &HashMap<String, RefInfo, impl BuildHa
                     .expect("find RefInfo by id")
             })
             .collect();
+
         let commit = cg.commit_at(ref_info.pos());
         assert_eq!(commit.id(), ref_info.id());
         assert_eq!(commit.root_tree_id(), ref_info.root_tree_id());
@@ -45,7 +48,7 @@ pub fn check_common(cg: &Graph, expected: &HashMap<String, RefInfo, impl BuildHa
         assert_eq!(
             commit
                 .iter_parents()
-                .collect::<Result<Vec<_>, _>>()
+                .collect::<std::result::Result<Vec<_>, _>>()
                 .expect("failed to access commit's parents"),
             expected_parents.iter().map(|x| x.pos()).collect::<Vec<_>>()
         );
@@ -134,10 +137,11 @@ pub fn inspect_refs(repo_dir: impl AsRef<Path>, refs: &[&'static str]) -> HashMa
     infos.sort_by_key(|x| x.1);
 
     let get_pos = |id: borrowed::Id| -> GraphPosition {
-        let pos = infos
+        let pos: u32 = infos
             .binary_search_by_key(&id, |x| x.1.to_borrowed())
-            .expect("sorted_ids to contain id");
-        let pos: u32 = pos.try_into().expect("graph position to fit in u32");
+            .expect("sorted_ids to contain id")
+            .try_into()
+            .expect("graph position to fit in u32");
         GraphPosition(pos)
     };