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/groups/pick.rs

@@ -7,9 +7,7 @@ use std::collections::{HashMap, HashSet};
 use cadcraft_doc::Handle;
 use serde_json::{Value, json};
 
-use super::super::{CommandSpec, bad};
-
-use super::super::always;
+use super::super::*;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/hatch.rs

@@ -11,13 +11,11 @@ use serde_json::{Value, json};
 
 use super::helpers::lwpoly;
 use super::*;
-
 use crate::{Accept, EngineError, Input, Interactive, Picker, Prompt, Result, Session, Step};
 
 mod assoc;
 mod edit;
 mod pick;
-use super::has_doc;
 pub(crate) use assoc::update as refill_associative;
 pub use pick::{HatchPicks, PickMode};
 

crates/engine/src/cmd/hatch/patfile.rs

@@ -13,7 +13,7 @@ use cadcraft_doc::library::{PatternLine, pattern, standard_patterns};
 use serde_json::{Value, json};
 
 use super::super::helpers::support_text;
-use super::{Result, Session, bad, bool_or};
+use super::*;
 
 /// Most user patterns held at once.
 pub const MAX_USER_PATTERNS: usize = 4096;

crates/engine/src/cmd/inquiry.rs

@@ -6,8 +6,7 @@ use cadcraft_doc::{Entity, EntityKind, Handle};
 use cadcraft_geom::{Polyline, Vec2, Vec3};
 use serde_json::{Value, json};
 
-use super::{CommandSpec, bad, bool_or, f64_req, point_req, point_value, points_param, targets};
-
+use super::*;
 use crate::units::{format_angle, format_distance};
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
@@ -1131,8 +1130,6 @@ impl Interactive for AreaM {
 
 #[cfg(test)]
 mod tests {
-    use cadcraft_doc::Handle;
-
     use super::*;
 
     /// #1440 review: a value one ulp past its bound (a border rectangle's shoelace area against

crates/engine/src/cmd/inquiry/count.rs

@@ -9,8 +9,7 @@ use cadcraft_doc::{Drawing, Entity, EntityKind, Handle, Insert, MAX_BLOCK_DEPTH,
 use cadcraft_geom::{Mat3, Vec2};
 use serde_json::{Value, json};
 
-use super::super::{bad, bool_or, point_req, str_param, targets};
-
+use super::super::*;
 use super::SelfCheck;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 

crates/engine/src/cmd/inquiry/loops.rs

@@ -13,8 +13,7 @@ use cadcraft_doc::{EntityKind, Handle};
 use cadcraft_geom::{Arc as GeoArc, EPS, Vec2};
 use serde_json::{Value, json};
 
-use super::super::bad;
-
+use super::super::*;
 use crate::{Result, Session};
 
 const CMD: &str = "loops";

crates/engine/src/cmd/overkill.rs

@@ -13,7 +13,8 @@ use cadcraft_geom::{TAU, Vec2, Vec3, ccw_sweep, norm_angle};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, number};
-use super::*;
+use super::{CommandSpec, bad, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/plotters.rs

@@ -14,7 +14,8 @@ use cadcraft_doc::{DevicePaper, Orientation, PageSetup, PlotOutput, PlotterConfi
 use cadcraft_geom::{Bounds2, Vec2};
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, Result, always, bad, has_doc, point_req, str_param};
+
 use crate::{Accept, EngineError, Input, Interactive, Prompt, Session, Step};
 
 /// Where plotter configuration files live. Names are file names ending in

crates/engine/src/cmd/props.rs

@@ -10,7 +10,8 @@ use cadcraft_doc::{EntityKind, Lineweight, Transparency};
 use cadcraft_geom::Vec3;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, always, bad, bool_or, f64_req, find_command, ok, point_req, point_value, str_param, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -1177,10 +1178,9 @@ fn run_rename(s: &mut Session, p: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use serde_json::json;
 
-    use crate::Session;
-
     #[test]
     fn properties_set_rejects_unloaded_linetype() {
         let mut s = Session::new();

crates/engine/src/cmd/props/linfile.rs

@@ -7,7 +7,8 @@ use serde_json::{Value, json};
 
 use super::super::helpers::support_text;
 use super::super::qselect::wildcard;
-use super::*;
+use super::{Result, Session, bad, bool_or, str_param};
+
 use crate::{Accept, Input, Interactive, Prompt, Step};
 
 /// Names no file may define: they are not linetype definitions.

crates/engine/src/cmd/props/matchprop.rs

@@ -6,7 +6,8 @@
 use cadcraft_doc::{Entity, EntityKind, Handle};
 use serde_json::{Value, json};
 
-use super::super::*;
+use super::super::{bad, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 /// Which properties MATCHPROP copies (its Settings).

crates/engine/src/cmd/qselect.rs

@@ -5,7 +5,8 @@ use cadcraft_color::Color;
 use cadcraft_doc::{Drawing, Entity, Handle};
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, bad, str_param};
+
 use crate::{Result, Session};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -320,9 +321,8 @@ fn run_info(s: &mut Session, p: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
-    use serde_json::json;
-
     use super::*;
+    use serde_json::json;
 
     fn session() -> Session {
         let mut s = Session::new();