Cleanup Reference

Author: MitMaro

src/git/reference.rs

@@ -4,41 +4,56 @@ use crate::git::ReferenceKind;
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct Reference {
 	/// The object id
-	pub(crate) hash: String,
+	hash: String,
 	/// The reference full name
-	pub(crate) name: String,
+	name: String,
 	/// The reference shorthand name
-	pub(crate) shorthand: String,
+	shorthand: String,
 	/// The kind of reference
-	pub(crate) kind: ReferenceKind,
+	kind: ReferenceKind,
 }
 
 impl Reference {
+	pub(crate) fn new(hash: String, name: String, shorthand: String, kind: ReferenceKind) -> Self {
+		Self {
+			hash,
+			name,
+			shorthand,
+			kind,
+		}
+	}
+
 	/// Get the oid of the reference
 	#[must_use]
+	#[allow(dead_code)]
 	pub(crate) fn hash(&self) -> &str {
 		self.hash.as_str()
 	}
 
 	/// Get the name of the reference
 	#[must_use]
+	#[allow(dead_code)]
 	pub(crate) fn name(&self) -> &str {
 		self.name.as_str()
 	}
 
 	/// Get the shorthand name of the reference
 	#[must_use]
+	#[allow(dead_code)]
 	pub(crate) fn shortname(&self) -> &str {
 		self.shorthand.as_str()
 	}
 
 	/// Get the kind of the reference
 	#[must_use]
+	#[allow(dead_code)]
 	pub(crate) const fn kind(&self) -> ReferenceKind {
 		self.kind
 	}
+}
 
-	pub(crate) fn from(reference: &git2::Reference<'_>) -> Self {
+impl From<&git2::Reference<'_>> for Reference {
+	fn from(reference: &git2::Reference<'_>) -> Self {
 		let oid = reference
 			.peel(git2::ObjectType::Any)
 			.expect("Reference peel failed")
@@ -47,12 +62,7 @@ impl Reference {
 		let name = String::from(reference.name().unwrap_or("InvalidRef"));
 		let shorthand = String::from(reference.shorthand().unwrap_or("InvalidRef"));
 
-		Self {
-			hash: format!("{oid}"),
-			name,
-			shorthand,
-			kind,
-		}
+		Self::new(format!("{oid}"), name, shorthand, kind)
 	}
 }
 

src/test_helpers/builders/reference.rs

@@ -3,7 +3,10 @@ use crate::git::{Reference, ReferenceKind};
 /// Builder for creating a new reference.
 #[derive(Debug)]
 pub(crate) struct ReferenceBuilder {
-	reference: Reference,
+	hash: String,
+	name: String,
+	shorthand: String,
+	kind: ReferenceKind,
 }
 
 impl ReferenceBuilder {
@@ -12,43 +15,41 @@ impl ReferenceBuilder {
 	#[must_use]
 	pub(crate) fn new(hash: &str) -> Self {
 		Self {
-			reference: Reference {
-				hash: String::from(hash),
-				name: String::from("refs/heads/main"),
-				shorthand: String::from("main"),
-				kind: ReferenceKind::Branch,
-			},
+			hash: String::from(hash),
+			name: String::from("refs/heads/main"),
+			shorthand: String::from("main"),
+			kind: ReferenceKind::Branch,
 		}
 	}
 
 	/// Set the hash.
 	pub(crate) fn hash(&mut self, hash: &str) -> &mut Self {
-		self.reference.hash = String::from(hash);
+		self.hash = String::from(hash);
 		self
 	}
 
 	/// Set the name.
 	pub(crate) fn name(&mut self, name: &str) -> &mut Self {
-		self.reference.name = String::from(name);
+		self.name = String::from(name);
 		self
 	}
 
 	/// Set the shortname.
 	pub(crate) fn shorthand(&mut self, shorthand: &str) -> &mut Self {
-		self.reference.shorthand = String::from(shorthand);
+		self.shorthand = String::from(shorthand);
 		self
 	}
 
 	/// Set the kind.
 	pub(crate) fn kind(&mut self, kind: ReferenceKind) -> &mut Self {
-		self.reference.kind = kind;
+		self.kind = kind;
 		self
 	}
 
 	/// Build the `Reference`.
 	#[must_use]
 	#[allow(clippy::missing_const_for_fn)]
 	pub(crate) fn build(self) -> Reference {
-		self.reference
+		Reference::new(self.hash, self.name, self.shorthand, self.kind)
 	}
 }