Make TaskRef a newtype wrapper

2 files changed, 10 insertions, 3 deletions

diff --git a/src/main.rs b/src/main.rs
index 2158e50..25bc6c4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,7 +37,7 @@ fn main() {
 	let mut rsv = resolve::Resolver::new(&tasks);
 
 	for task in opts.tasks {
-		let errors = rsv.add_goal(&task);
+		let errors = rsv.add_goal(&TaskRef(task));
 		if !errors.is_empty() {
 			for error in errors {
 				eprintln!("{}", error);
diff --git a/src/types.rs b/src/types.rs
index 2752e1d..8649042 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -36,7 +36,14 @@ pub type InputHash = StringHash;
 pub type OutputHasher = Sha256;
 pub type OutputHash = StringHash;
 
-pub type TaskRef = String;
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Hash)]
+pub struct TaskRef(pub String);
+
+impl Display for TaskRef {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		self.0.fmt(f)
+	}
+}
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct TaskDef {
@@ -65,7 +72,7 @@ pub struct TaskMap(pub HashMap<String, TaskDef>);
 
 impl TaskMap {
 	pub fn get(&self, task: &TaskRef) -> Option<&TaskDef> {
-		self.0.get(task)
+		self.0.get(&task.0)
 	}
 }