Format imports so the CI fmt gate passes

crates/engine/src/cmd/annoscale.rs

@@ -7,8 +7,7 @@ use cadcraft_doc::{AnnoScale, Drawing, EntityKind, Handle, MAX_SCALES, is_annota
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, SelectRun};
-use super::{CommandSpec, bad, f64_req, targets};
-
+use super::*;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/annotate.rs

@@ -9,8 +9,7 @@ use serde_json::{Value, json};
 
 use super::helpers::v3;
 use super::machines::{SelOutcome, SelectPhase, SelectRun};
-use super::{CommandSpec, bad, point_param, point_req, points_param, str_param, targets};
-
+use super::*;
 use crate::{Accept, EngineError, Input, Interactive, LeaderOrder, MLeaderOptions, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/annotate_dimedit.rs

@@ -5,11 +5,8 @@ use cadcraft_doc::{DimBreak, DimKind, Dimension, EntityKind, Handle, Inspection,
 use cadcraft_geom::{Segment, Vec2};
 use serde_json::{Value, json};
 
-use super::super::helpers::v3;
-use super::super::machines::{SelOutcome, SelectPhase};
-use super::super::{CommandSpec, bad, bool_or, point_param, point_req, size_param, str_param, targets};
-use super::{DimText, add_dim, circle_of, dim, dims_of, pick_at};
-
+use super::machines::{SelOutcome, SelectPhase};
+use super::*;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 /// Most objects DIMBREAK Auto looks at, and most breaks it adds to one dimension.

crates/engine/src/cmd/annotate_qdim.rs

@@ -6,10 +6,8 @@ use cadcraft_doc::{DimKind, EntityKind, Handle, Prim};
 use cadcraft_geom::{Segment, Vec2};
 use serde_json::{Value, json};
 
-use super::super::machines::{SelOutcome, SelectPhase};
-use super::super::{bad, point_param, point_req, points_param, str_param, targets};
-use super::{MAX_CHAIN, assoc_enabled, dim};
-
+use super::machines::{SelOutcome, SelectPhase};
+use super::*;
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub(super) const PARAMS: &str = "{handles?, at: [x,y] (dimension line position), mode?: continuous|staggered|baseline|ordinate|radius|diameter (default continuous), vertical?: bool (default: from `at`), datum?: [x,y] (baseline and ordinate; default the first point, or the origin for ordinate), add?: [[x,y]], remove?: [[x,y]] (dimension points; removes those within `tolerance`)}";

crates/engine/src/cmd/array.rs

@@ -17,8 +17,7 @@ use serde_json::{Value, json};
 use super::helpers::{line, v3};
 use super::machines::{SelOutcome, SelectPhase, number};
 use super::modify::transform_entities;
-use super::{CommandSpec, bad, bool_or, f64_or, find_command, point_param, point_req, str_param, targets};
-
+use super::*;
 use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
 
 mod edit;

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";