summaryrefslogtreecommitdiffstats
path: root/crates/driver/src/recipe.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/driver/src/recipe.rs')
-rw-r--r--crates/driver/src/recipe.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/crates/driver/src/recipe.rs b/crates/driver/src/recipe.rs
index f491ff6..fa6709a 100644
--- a/crates/driver/src/recipe.rs
+++ b/crates/driver/src/recipe.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, collections::HashMap, ffi::OsStr, fs::File, path::Path, result};
+use std::{collections::HashMap, ffi::OsStr, fs::File, path::Path, result};
use scoped_tls_hkt::scoped_thread_local;
use serde::{Deserialize, Deserializer};
@@ -6,7 +6,7 @@ use walkdir::WalkDir;
use common::{error::*, types::*};
-use crate::task::{RecipeMeta, TaskDef};
+use crate::task::{RecipeMeta, TaskDef, TaskMeta};
scoped_thread_local!(static CURRENT_RECIPE: str);
@@ -85,25 +85,25 @@ pub fn read_recipes<P: AsRef<Path>>(path: P) -> Result<HashMap<TaskID, Vec<TaskD
else {
continue;
};
- let base_recipename = if recipename.is_empty() {
- Cow::Borrowed(basename)
+ let recipename_full = if recipename.is_empty() {
+ basename.to_string()
} else {
- Cow::Owned(format!("{basename}/{recipename}"))
+ format!("{basename}/{recipename}")
};
- let recipe = CURRENT_RECIPE.set(&base_recipename, || read_recipe(path))?;
-
- let mut meta = recipe.meta;
- if meta.name.is_empty() {
- meta.name = basename.to_string();
- }
+ let recipe = CURRENT_RECIPE.set(&recipename_full, || read_recipe(path))?;
for (label, mut task) in recipe.tasks {
let task_id = TaskID {
- recipe: base_recipename.as_ref().to_owned(),
+ recipe: recipename_full.clone(),
task: label,
};
- task.meta = meta.clone();
+ task.meta = TaskMeta {
+ basename: basename.to_string(),
+ recipename: recipename.to_string(),
+ recipe: recipename_full.clone(),
+ version: recipe.meta.version.clone(),
+ };
tasks.entry(task_id).or_default().push(task);
}
}