From 2280ea5f3dfc4f92cc033250f811c71cebba9c07 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 24 Oct 2026 08:51:59 +0000 Subject: [PATCH] refactor: replace wildcard imports with explicit ones (S2208, batch_04) Co-Authored-By: Claude Sonnet 5.5 --- crates/engine/src/cmd/groups/pick.rs | 3 ++- crates/engine/src/cmd/hatch.rs | 5 +++-- crates/engine/src/cmd/hatch/patfile.rs | 2 +- crates/engine/src/cmd/inquiry.rs | 5 +++-- crates/engine/src/cmd/inquiry/count.rs | 3 ++- crates/engine/src/cmd/inquiry/loops.rs | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/crates/engine/src/cmd/groups/pick.rs b/crates/engine/src/cmd/groups/pick.rs index c18ab96ee..8eb0baaa7 100644 --- a/crates/engine/src/cmd/groups/pick.rs +++ b/crates/engine/src/cmd/groups/pick.rs @@ -7,7 +7,8 @@ use std::collections::{HashMap, HashSet}; use cadcraft_doc::Handle; use serde_json::{Value, json}; -use super::super::*; +use super::super::{CommandSpec, bad}; + use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/hatch.rs b/crates/engine/src/cmd/hatch.rs index 8b33cc716..5377ac363 100644 --- a/crates/engine/src/cmd/hatch.rs +++ b/crates/engine/src/cmd/hatch.rs @@ -10,7 +10,8 @@ use cadcraft_geom::{Bounds2, PolyVertex, Polyline, Vec2, point_in_polygon}; use serde_json::{Value, json}; use super::helpers::lwpoly; -use super::*; +use super::{CommandSpec, bad, bool_or, f64_or, point_param, points_param, size_param, str_param, targets}; + use crate::{Accept, EngineError, Input, Interactive, Picker, Prompt, Result, Session, Step}; mod assoc; @@ -782,7 +783,7 @@ impl Interactive for BoundaryM { mod tests { use serde_json::json; - use super::*; + use super::{CommandSpec, bad, bool_or, f64_or, point_param, points_param, size_param, str_param, targets}; /// The drawing's only hatch and its handle (hatches go to the back of the draw order, so not the last entity). fn only_hatch(s: &Session) -> (String, Hatch) { diff --git a/crates/engine/src/cmd/hatch/patfile.rs b/crates/engine/src/cmd/hatch/patfile.rs index 7ffe54724..7a4a727d0 100644 --- a/crates/engine/src/cmd/hatch/patfile.rs +++ b/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::*; +use super::{Result, Session, bad, bool_or}; /// Most user patterns held at once. pub const MAX_USER_PATTERNS: usize = 4096; diff --git a/crates/engine/src/cmd/inquiry.rs b/crates/engine/src/cmd/inquiry.rs index 1f7f6f2ab..a284d8fb5 100644 --- a/crates/engine/src/cmd/inquiry.rs +++ b/crates/engine/src/cmd/inquiry.rs @@ -6,7 +6,8 @@ use cadcraft_doc::{Entity, EntityKind, Handle}; use cadcraft_geom::{Polyline, Vec2, Vec3}; use serde_json::{Value, json}; -use super::*; +use super::{CommandSpec, bad, bool_or, point_req, points_param, targets}; + use crate::units::{format_angle, format_distance}; use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; @@ -1011,7 +1012,7 @@ impl Interactive for AreaM { #[cfg(test)] mod tests { - use super::*; + use super::{CommandSpec, bad, bool_or, point_req, points_param, targets}; /// #1440 review: a value one ulp past its bound (a border rectangle's shoelace area against /// the extents' `width * height`) is rounding, not a bug; a value clearly past it still is. diff --git a/crates/engine/src/cmd/inquiry/count.rs b/crates/engine/src/cmd/inquiry/count.rs index ea0d5f136..601dce4a1 100644 --- a/crates/engine/src/cmd/inquiry/count.rs +++ b/crates/engine/src/cmd/inquiry/count.rs @@ -9,7 +9,8 @@ use cadcraft_doc::{Drawing, Entity, EntityKind, Handle, Insert, MAX_BLOCK_DEPTH, use cadcraft_geom::{Mat3, Vec2}; use serde_json::{Value, json}; -use super::super::*; +use super::super::{bad, bool_or, point_req, str_param, targets}; + use super::SelfCheck; use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; diff --git a/crates/engine/src/cmd/inquiry/loops.rs b/crates/engine/src/cmd/inquiry/loops.rs index 2a452151f..20c4ac6b8 100644 --- a/crates/engine/src/cmd/inquiry/loops.rs +++ b/crates/engine/src/cmd/inquiry/loops.rs @@ -13,7 +13,8 @@ use cadcraft_doc::{EntityKind, Handle}; use cadcraft_geom::{Arc as GeoArc, EPS, Vec2}; use serde_json::{Value, json}; -use super::super::*; +use super::super::bad; + use crate::{Result, Session}; const CMD: &str = "loops";