clean up more dependencies

Author: sunshowers

Cargo.lock

@@ -24,7 +24,6 @@ chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
 debug-ignore = "1"
 derive-where = "1"
-either = "1"
 futures = "0.3"
 indent_write = "2"
 indexmap = { version = "2", features = ["serde"] }

Cargo.toml

@@ -19,9 +19,7 @@ schemars08 = ["dep:schemars", "newtype-uuid/schemars08"]
 
 [dependencies]
 anyhow.workspace = true
-chrono.workspace = true
 derive-where.workspace = true
-either.workspace = true
 indexmap.workspace = true
 indent_write.workspace = true
 petgraph.workspace = true

crates/oxide-update-engine-types/Cargo.toml

@@ -17,7 +17,6 @@ use crate::{
     spec::{EngineSpec, NestedSpec},
 };
 use derive_where::derive_where;
-use either::Either;
 use indexmap::IndexMap;
 use petgraph::{prelude::*, visit::Walker};
 use std::{
@@ -1421,15 +1420,31 @@ impl<S: EngineSpec> StepStatus<S> {
     ///
     /// Events are sorted by event index.
     pub fn low_priority(&self) -> impl Iterator<Item = &StepEvent<S>> {
+        // Two-variant iterator to avoid boxing: one arm yields
+        // the stored events, the other yields nothing.
+        enum LowPriority<I> {
+            Some(I),
+            Empty,
+        }
+        impl<I: Iterator> Iterator for LowPriority<I> {
+            type Item = I::Item;
+            fn next(&mut self) -> Option<Self::Item> {
+                match self {
+                    Self::Some(iter) => iter.next(),
+                    Self::Empty => None,
+                }
+            }
+        }
+
         match self {
             Self::Running { low_priority, .. } => {
-                Either::Left(low_priority.iter())
+                LowPriority::Some(low_priority.iter())
             }
             Self::NotStarted
             | Self::Completed { .. }
             | Self::Failed { .. }
             | Self::Aborted { .. }
-            | Self::WillNotBeRun { .. } => Either::Right(std::iter::empty()),
+            | Self::WillNotBeRun { .. } => LowPriority::Empty,
         }
     }
 

crates/oxide-update-engine-types/src/buffer/imp.rs

@@ -18,14 +18,12 @@ workspace = true
 schemars08 = ["oxide-update-engine-types/schemars08"]
 
 [dependencies]
-anyhow.workspace = true
 cancel-safe-futures.workspace = true
 debug-ignore.workspace = true
 derive-where.workspace = true
 futures.workspace = true
 linear-map.workspace = true
 oxide-update-engine-types.workspace = true
-serde_json.workspace = true
 slog.workspace = true
 tokio.workspace = true