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

The batch replaced glob imports with explicit lists that missed names
the files still use, and pointed some sub-module imports at the wrong
level. Restore the required imports and the test module globs.
---
 crates/engine/src/cmd/modify2/pedit_vertex.rs | 1 +
 crates/engine/src/cmd/modify2/splinedit.rs    | 1 +
 crates/engine/src/cmd/options.rs              | 5 ++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/engine/src/cmd/modify2/pedit_vertex.rs b/crates/engine/src/cmd/modify2/pedit_vertex.rs
index 68d63ea3d..c4d6b2b05 100644
--- a/crates/engine/src/cmd/modify2/pedit_vertex.rs
+++ b/crates/engine/src/cmd/modify2/pedit_vertex.rs
@@ -1,6 +1,7 @@
 //! PEDIT Edit vertex: Break and Straighten between two marked vertices, Tangent directions
 //! that Fit honours, and Regen.
 
+use super::super::{point_value};
 use super::{
     EntityKind, Handle, Input, LwPolyline, PPhase, PeditM, PolyVertex, Result, Session, Value, Vec2, bad, curves, json, other, push_entity, set_kind,
 };
diff --git a/crates/engine/src/cmd/modify2/splinedit.rs b/crates/engine/src/cmd/modify2/splinedit.rs
index 2b853c675..f5ba767fb 100644
--- a/crates/engine/src/cmd/modify2/splinedit.rs
+++ b/crates/engine/src/cmd/modify2/splinedit.rs
@@ -6,6 +6,7 @@
 //! parametrisation, end tangents and fit tolerance. Control-point edits change the curve
 //! directly and drop the fit data, as the curve no longer follows it.
 
+use super::super::{point_value, points_param};
 use super::{
     Accept, Entity, EntityKind, Handle, Input, Interactive, LwPolyline, MAX_GEN, PolyVertex, Prompt, Result, SelOutcome, SelectPhase, Session, Space,
     Spline, Step, Value, Vec2, bad, bool_or, curves, f64_req, json, line, number, other, point_req, set_kind, str_param, targets,
diff --git a/crates/engine/src/cmd/options.rs b/crates/engine/src/cmd/options.rs
index 8c5d47f10..9dbeeddbf 100644
--- a/crates/engine/src/cmd/options.rs
+++ b/crates/engine/src/cmd/options.rs
@@ -8,8 +8,7 @@
 
 use serde_json::{Map, Value, json};
 
-use super::{CommandSpec, bad};
-
+use super::*;
 use crate::{Result, Session, Settings};
 
 /// The profile variables, in the order [`profile`] lists them.
@@ -178,7 +177,7 @@ fn run_options(s: &mut Session, p: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
-    use super::{CommandSpec, bad};
+    use super::*;
 
     #[test]
     fn every_profile_var_round_trips_through_restore() {