From 4b77be1ab51e1a2f3914bc5218b2413ad40e5e7e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 6 Apr 2024 12:03:57 +0200 Subject: driver: move RecipeMeta to recipe module --- crates/driver/src/recipe.rs | 8 +++++++- crates/driver/src/task.rs | 6 ------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/driver/src/recipe.rs b/crates/driver/src/recipe.rs index bf8ab99..aa728c8 100644 --- a/crates/driver/src/recipe.rs +++ b/crates/driver/src/recipe.rs @@ -6,7 +6,7 @@ use walkdir::WalkDir; use common::{error::*, types::*}; -use crate::task::{RecipeMeta, TaskDef, TaskMeta}; +use crate::task::{TaskDef, TaskMeta}; scoped_thread_local!(static CURRENT_RECIPE: str); @@ -30,6 +30,12 @@ where }) } +#[derive(Clone, Debug, Deserialize, Default)] +pub struct RecipeMeta { + pub name: Option, + pub version: Option, +} + #[derive(Debug, Deserialize)] struct Recipe { #[serde(default)] diff --git a/crates/driver/src/task.rs b/crates/driver/src/task.rs index 1047d1e..e30f214 100644 --- a/crates/driver/src/task.rs +++ b/crates/driver/src/task.rs @@ -9,12 +9,6 @@ use crate::{ recipe, }; -#[derive(Clone, Debug, Deserialize, Default)] -pub struct RecipeMeta { - pub name: Option, - pub version: Option, -} - #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Hash)] pub struct TaskDep { #[serde(flatten, deserialize_with = "recipe::deserialize_task_id")] -- cgit v1.2.3