From 6f11f3f247d8949401cd0afb676198b439053740 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 Apr 2024 19:34:13 +0200
Subject: Replace 'inherit' recipe field with 'parent'

All occurrences of 'inherit' in the code are replaced with 'parent' or
'ancestors'.
---
 crates/driver/src/context.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'crates/driver/src/context.rs')

diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs
index e6e60b1..3bf4bf5 100644
--- a/crates/driver/src/context.rs
+++ b/crates/driver/src/context.rs
@@ -424,7 +424,7 @@ impl Context {
 		Ok(Cow::Owned(ret))
 	}
 
-	fn inherit_ref<'ctx>(&'ctx self, dep: &'ctx InheritDep, args: &TaskArgs) -> Result<TaskRef> {
+	fn parent_ref<'ctx>(&'ctx self, dep: &'ctx ParentDep, args: &TaskArgs) -> Result<TaskRef> {
 		let mapped_args = Context::map_args(&dep.dep.id, &dep.dep.args, args, false)?;
 		self.task_ref(&dep.dep.id, mapped_args.as_ref())
 	}
@@ -442,19 +442,18 @@ impl Context {
 		})
 	}
 
-	pub fn get_inherit_depend<'ctx>(
+	pub fn get_parent_depend<'ctx>(
 		&'ctx self,
 		task_ref: &TaskRef<'ctx>,
 	) -> Result<Option<TaskRef>> {
 		let task = self.get(task_ref)?;
-		let inherit = match &task.inherit {
-			Some(inherit) => inherit,
-			None => return Ok(None),
+		let Some(parent) = &task.parent else {
+			return Ok(None);
 		};
-		Some(self.inherit_ref(inherit, &task_ref.args)).transpose()
+		Some(self.parent_ref(parent, &task_ref.args)).transpose()
 	}
 
-	fn inherit_iter<'ctx>(
+	fn ancestor_iter<'ctx>(
 		&'ctx self,
 		task_ref: &TaskRef<'ctx>,
 	) -> impl Iterator<Item = Result<TaskRef>> {
@@ -468,7 +467,7 @@ impl Context {
 					Ok(task_ref) => task_ref,
 					Err(err) => return Some(Err(err)),
 				};
-				self.1 = self.0.get_inherit_depend(&task_ref).transpose();
+				self.1 = self.0.get_parent_depend(&task_ref).transpose();
 				Some(Ok(task_ref))
 			}
 		}
@@ -483,7 +482,7 @@ impl Context {
 		let mut ret = HashSet::new();
 		let mut allow_noinherit = true;
 
-		for current in self.inherit_iter(task_ref) {
+		for current in self.ancestor_iter(task_ref) {
 			let current_ref = current?;
 			let task = self.get(&current_ref)?;
 			let entries = task
@@ -507,7 +506,7 @@ impl Context {
 		let mut ret = HashSet::new();
 		let mut allow_noinherit = true;
 
-		for current in self.inherit_iter(task_ref) {
+		for current in self.ancestor_iter(task_ref) {
 			let current_ref = current?;
 			let task = self.get(&current_ref)?;
 			let entries = task
-- 
cgit v1.2.3