diff options
Diffstat (limited to 'crates/driver/src/context.rs')
| -rw-r--r-- | crates/driver/src/context.rs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs index fb0ea96..5564c86 100644 --- a/crates/driver/src/context.rs +++ b/crates/driver/src/context.rs @@ -1,5 +1,6 @@ use std::{ borrow::Cow, + cmp::Ordering, collections::{HashMap, HashSet}, fmt::Display, hash::Hash, @@ -273,16 +274,21 @@ impl Context { .all(|(key, value)| args.get(key) == Some(value)) } + fn compare_tasks(task1: &TaskDef, task2: &TaskDef) -> Ordering { + task1 + .priority + .cmp(&task2.priority) + .then(deb_version::compare_versions( + task1.meta.version.as_deref().unwrap_or_default(), + task2.meta.version.as_deref().unwrap_or_default(), + )) + } + fn select_task<'ctx>(tasks: &'ctx [TaskDef], args: &TaskArgs) -> Option<&'ctx TaskDef> { tasks .iter() .filter(|task| Self::match_task(task, args)) - .max_by(|task1, task2| { - deb_version::compare_versions( - task1.meta.version.as_deref().unwrap_or_default(), - task2.meta.version.as_deref().unwrap_or_default(), - ) - }) + .max_by(|task1, task2| Self::compare_tasks(task1, task2)) } fn get_with_args<'ctx>(&'ctx self, id: &'ctx TaskID, args: &TaskArgs) -> Result<&TaskDef> { |