From 0b526e4a6836bde0f5187d57e1913752e59b8609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Herbel?= Date: Fri, 22 Nov 2024 10:13:26 +0100 Subject: [PATCH] Use `StepWithPlans` type alias in more places --- src/bin/scheduler/setup/steps/api.rs | 2 +- src/bin/scheduler/setup/steps/run.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/scheduler/setup/steps/api.rs b/src/bin/scheduler/setup/steps/api.rs index b2ed997e..c58e3b11 100644 --- a/src/bin/scheduler/setup/steps/api.rs +++ b/src/bin/scheduler/setup/steps/api.rs @@ -29,7 +29,7 @@ impl SetupStep for SetupStepSuccess { } } -pub fn skip(plans: Vec) -> (Box, Vec) { +pub fn skip(plans: Vec) -> StepWithPlans { (Box::new(SetupStepSuccess {}), plans) } diff --git a/src/bin/scheduler/setup/steps/run.rs b/src/bin/scheduler/setup/steps/run.rs index dd8ff1fc..fbb9372a 100644 --- a/src/bin/scheduler/setup/steps/run.rs +++ b/src/bin/scheduler/setup/steps/run.rs @@ -1,4 +1,4 @@ -use super::api::{run_steps, SetupStep}; +use super::api::{run_steps, StepWithPlans}; use super::{directories, rcc}; use crate::internal_config::{sort_plans_by_grouping, GlobalConfig, Plan}; use robotmk::results::SetupFailure; @@ -27,7 +27,7 @@ pub fn run( Ok((plans, failures)) } -type Gatherer = fn(&GlobalConfig, Vec) -> Vec<(Box, Vec)>; +type Gatherer = fn(&GlobalConfig, Vec) -> Vec; #[cfg(unix)] type Steps = [Gatherer; 10]; #[cfg(windows)]