rename AliasId to CommitAlias, add UnwalkedAlias

Author: philocalyst

asyncgit/src/graph/mod.rs

@@ -19,16 +19,28 @@ pub struct LaneIndex(u8);
 /// The alias is a dense integer index created by [`GraphOids`](super::oids::GraphOids)
 /// that avoids storing full [`CommitId`](crate::sync::CommitId)s inside the lane state.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
-pub struct AliasId(usize);
+pub struct CommitAlias(usize);
 
-impl std::ops::Deref for AliasId {
+/// An alias for a commit that had not yet been walked when the value
+/// was minted.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct UnwalkedAlias(CommitAlias);
+
+impl UnwalkedAlias {
+	/// The underlying alias, for comparisons against walked commits.
+	pub const fn get(self) -> CommitAlias {
+		self.0
+	}
+}
+
+impl std::ops::Deref for CommitAlias {
 	type Target = usize;
 	fn deref(&self) -> &usize {
 		&self.0
 	}
 }
 
-impl From<usize> for AliasId {
+impl From<usize> for CommitAlias {
 	fn from(v: usize) -> Self {
 		Self(v)
 	}

asyncgit/src/graph/oids.rs

@@ -1,35 +1,30 @@
-use super::AliasId;
+use super::CommitAlias;
 use crate::sync::CommitId;
 use std::collections::HashMap;
 
 /// mapping of `CommitId` to a numeric alias
-pub struct GraphOids(HashMap<CommitId, AliasId>);
-
-impl Default for GraphOids {
-	fn default() -> Self {
-		Self::new()
-	}
-}
+#[derive(Default)]
+pub struct GraphOids(HashMap<CommitId, CommitAlias>);
 
 impl GraphOids {
 	/// Create an empty alias map.
 	pub fn new() -> Self {
-		Self(HashMap::new())
+		Self::default()
 	}
 
 	/// Get the alias for `id`, assigning a new one if it doesn't exist yet.
-	pub fn get_or_insert(&mut self, id: &CommitId) -> AliasId {
+	pub fn get_or_insert(&mut self, id: &CommitId) -> CommitAlias {
 		if let Some(&alias) = self.0.get(id) {
 			return alias;
 		}
 
-		let alias = AliasId::from(self.0.len());
+		let alias = CommitAlias::from(self.0.len());
 		self.0.insert(*id, alias);
 		alias
 	}
 
 	/// Look up the alias for `id`, returning `None` if not found.
-	pub fn get(&self, id: &CommitId) -> Option<AliasId> {
+	pub fn get(&self, id: &CommitId) -> Option<CommitAlias> {
 		self.0.get(id).copied()
 	}
 }