Some more clippy fixes

Author: spirali

crates/tako/src/internal/scheduler/batches.rs

@@ -53,10 +53,7 @@ pub(crate) fn create_task_batches(
         ..
     } = core.split_mut();
 
-    let queues: Vec<_> = task_queues
-        .iter()
-        .filter_map(|q| (!q.is_empty()).then_some(q))
-        .collect();
+    let queues: Vec<_> = task_queues.iter().filter(|q| !q.is_empty()).collect();
     if queues.is_empty() {
         return Vec::new();
     }
@@ -212,9 +209,8 @@ fn prune_progressive<T>(vec: &mut Vec<T>, prefix_size: usize, size_limit: usize)
     }
 
     // To prune in-place
-    for i in 0..size_limit {
-        let target_idx = indices[i];
-        vec.swap(i, target_idx);
+    for (i, target_idx) in indices.iter().enumerate().take(size_limit) {
+        vec.swap(i, *target_idx);
     }
 
     vec.truncate(size_limit);

crates/tako/src/internal/scheduler/query.rs

@@ -35,12 +35,7 @@ pub(crate) fn compute_new_worker_query(
             if query.partial {
                 // If query is partial, add a fake maximal resources for resource that was not explicitly defined
                 for name in resource_map.iter_names() {
-                    if resources
-                        .resources
-                        .iter()
-                        .find(|r| r.name == *name)
-                        .is_none()
-                    {
+                    if !resources.resources.iter().any(|r| r.name == *name) {
                         resources.resources.push(ResourceDescriptorItem {
                             name: name.to_string(),
                             kind: ResourceDescriptorKind::Sum {

crates/tako/src/internal/scheduler/taskqueue.rs

@@ -7,9 +7,11 @@ use std::collections::btree_map::{Entry, OccupiedEntry};
 use std::collections::{BTreeMap, BTreeSet};
 
 #[derive(Debug)]
+/// Do not allocate BTreeSet if there is just one task (per priority level)
+/// There may be a many tasks but each with different priority
 pub(crate) enum OneOrMoreTaskIds {
     One(TaskId),
-    More(Box<BTreeSet<TaskId>>),
+    More(BTreeSet<TaskId>),
 }
 
 impl OneOrMoreTaskIds {
@@ -159,7 +161,7 @@ impl TaskQueue {
                     let mut task_ids: BTreeSet<_> = Default::default();
                     task_ids.insert(*t_id);
                     task_ids.insert(task_id);
-                    e.insert(OneOrMoreTaskIds::More(Box::new(task_ids)));
+                    e.insert(OneOrMoreTaskIds::More(task_ids));
                 }
                 OneOrMoreTaskIds::More(tasks) => {
                     tasks.insert(task_id);
@@ -174,16 +176,14 @@ impl TaskQueue {
         }
         match self.queue.entry(Reverse(priority)) {
             Entry::Vacant(e) => {
-                e.insert(OneOrMoreTaskIds::More(Box::new(
-                    task_ids.iter().copied().collect(),
-                )));
+                e.insert(OneOrMoreTaskIds::More(task_ids.iter().copied().collect()));
             }
             Entry::Occupied(mut e) => match e.get_mut() {
                 OneOrMoreTaskIds::One(t_id) => {
                     let mut new_ids: BTreeSet<_> = Default::default();
                     new_ids.insert(*t_id);
                     new_ids.extend(task_ids.iter().copied());
-                    e.insert(OneOrMoreTaskIds::More(Box::new(new_ids)));
+                    e.insert(OneOrMoreTaskIds::More(new_ids));
                 }
                 OneOrMoreTaskIds::More(tasks) => {
                     tasks.extend(task_ids.iter().copied());
@@ -355,9 +355,7 @@ impl TaskQueue {
     }
 
     pub fn take_one(&mut self) -> Option<TaskId> {
-        let Some(mut entry) = self.queue.first_entry() else {
-            return None;
-        };
+        let mut entry = self.queue.first_entry()?;
         match entry.get_mut() {
             OneOrMoreTaskIds::One(x) => {
                 let r = *x;

crates/tako/src/internal/server/workerload.rs

@@ -132,16 +132,14 @@ impl WorkerResources {
                         .unwrap_or(ResourceAmount::ZERO)
                         .div(requested)
                         .min(MAX_TASK_PER_WORKER) as u32
+                } else if self
+                    .n_resources
+                    .get(e.resource_id)
+                    .is_none_or(|r| r.is_zero())
+                {
+                    0
                 } else {
-                    if self
-                        .n_resources
-                        .get(e.resource_id)
-                        .is_none_or(|r| r.is_zero())
-                    {
-                        0
-                    } else {
-                        1
-                    }
+                    1
                 }
             })
             .min()

crates/tako/src/internal/solver/mod.rs

@@ -127,8 +127,10 @@ impl LpSolver {
                 "{}{}*{}",
                 if i == 0 {
                     ""
+                } else if *weight < 0.0 {
+                    " - "
                 } else {
-                    if *weight < 0.0 { " - " } else { " + " }
+                    " + "
                 },
                 if *weight >= 0.0 || i == 0 {
                     *weight