Showing the changes to git-commitgraph/tests/commitgraph.rs (1 of 51 files). Show all
Unified · Split
| @@ -75,15 +75,15 @@ pub fn fixture_path(path: &str) -> PathBuf { · 74 unmodified lines | |||
| 75 | PathBuf::from("tests").join("fixtures").join(path) | 75 | PathBuf::from("tests").join("fixtures").join(path) |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | pub fn hex_to_id(hex: &[u8]) -> git_hash::Id { | 78 | pub fn hex_to_id(hex: &[u8]) -> git_hash::ObjectId { |
| 79 | git_hash::Id::from_40_bytes_in_hex(hex).expect("40 bytes hex") | 79 | git_hash::ObjectId::from_40_bytes_in_hex(hex).expect("40 bytes hex") |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | pub struct RefInfo { | 82 | pub struct RefInfo { |
| 83 | id: git_hash::Id, | 83 | id: git_hash::ObjectId, |
| 84 | parent_ids: Vec<git_hash::Id>, | 84 | parent_ids: Vec<git_hash::ObjectId>, |
| 85 | pos: GraphPosition, | 85 | pos: GraphPosition, |
| 86 | root_tree_id: git_hash::Id, | 86 | root_tree_id: git_hash::ObjectId, |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | impl RefInfo { | 89 | impl RefInfo { |
| @@ -124,11 +124,11 @@ pub fn inspect_refs(repo_dir: impl AsRef<Path>, refs: &[&'static str]) -> HashMa · 34 unmodified lines | |||
| 124 | let parts = x.trim_end().split(' ').collect::<Vec<_>>(); | 124 | let parts = x.trim_end().split(' ').collect::<Vec<_>>(); |
| 125 | ( | 125 | ( |
| 126 | parts[0].to_string(), | 126 | parts[0].to_string(), |
| 127 | git_hash::Id::from_40_bytes_in_hex(parts[1].as_bytes()).expect("40 bytes hex"), | 127 | git_hash::ObjectId::from_40_bytes_in_hex(parts[1].as_bytes()).expect("40 bytes hex"), |
| 128 | git_hash::Id::from_40_bytes_in_hex(parts[2].as_bytes()).expect("40 bytes hex"), | 128 | git_hash::ObjectId::from_40_bytes_in_hex(parts[2].as_bytes()).expect("40 bytes hex"), |
| 129 | parts[3..] | 129 | parts[3..] |
| 130 | .iter() | 130 | .iter() |
| 131 | .map(|x| git_hash::Id::from_40_bytes_in_hex(x.as_bytes()).expect("40 bytes hex")) | 131 | .map(|x| git_hash::ObjectId::from_40_bytes_in_hex(x.as_bytes()).expect("40 bytes hex")) |
| 132 | .collect(), | 132 | .collect(), |
| 133 | ) | 133 | ) |
| 134 | }) | 134 | }) |