From e8530e4e09399b7c5a5bcd471e62298db9229350 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Sat, 24 Oct 2026 21:20:15 -0400
Subject: [PATCH] Restore imports that the cadcraft batch dropped so the engine
 compiles

Explicit import lists missed names the files still use. Restore them and
the test-module globs.
---
 crates/engine/src/cmd/settings.rs | 2 +-
 crates/engine/src/cmd/utility.rs  | 4 ++--
 crates/engine/src/cmd/view.rs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/engine/src/cmd/settings.rs b/crates/engine/src/cmd/settings.rs
index 5cc9d7b65..1cd6cbfaa 100644
--- a/crates/engine/src/cmd/settings.rs
+++ b/crates/engine/src/cmd/settings.rs
@@ -2,7 +2,7 @@
 
 use serde_json::{Value, json};
 
-use super::{CommandSpec, bad, point_param, str_param};
+use super::{CommandSpec, always, bad, point_param, str_param};
 
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
diff --git a/crates/engine/src/cmd/utility.rs b/crates/engine/src/cmd/utility.rs
index 050700018..2c4350270 100644
--- a/crates/engine/src/cmd/utility.rs
+++ b/crates/engine/src/cmd/utility.rs
@@ -4,7 +4,7 @@ use cadcraft_doc::{EntityKind, Handle};
 use cadcraft_geom::Vec2;
 use serde_json::{Value, json};
 
-use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
+use super::{CommandSpec, always, bad, bool_or, point_param, points_param, str_param, targets};
 
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
@@ -380,7 +380,7 @@ impl Interactive for MeasureM {
 
 #[cfg(test)]
 mod tests {
-    use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
+    use super::*;
 
     #[test]
     fn calculator() {
diff --git a/crates/engine/src/cmd/view.rs b/crates/engine/src/cmd/view.rs
index 2494bb56a..4586cd988 100644
--- a/crates/engine/src/cmd/view.rs
+++ b/crates/engine/src/cmd/view.rs
@@ -6,7 +6,7 @@ use cadcraft_geom::{Bounds2, Vec2};
 use serde_json::{Value, json};
 
 use super::machines::{SelectRun, number};
-use super::{CommandSpec, bad, bool_or, f64_req, ok, point_req, str_param, targets};
+use super::{CommandSpec, bad, bool_or, f64_or, f64_req, ok, point_param, point_req, str_param, targets};
 
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step, View};