From 656dd4d09a2d41be7f878a36eae584d586caa652 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 25 Oct 2026 18:18:29 -0400 Subject: [PATCH] refactor: explicit imports instead of wildcards (S2208, batch_00) (#2037) * refactor: replace wildcard imports with explicit ones (S2208, batch_00) * refactor: replace wildcard imports with explicit ones (S2208, batch_00) Explicit lists now resolve the names each file uses, and the test module keeps its glob so it still sees the parent's items. --- crates/engine/src/cmd/annoscale.rs | 3 ++- crates/engine/src/cmd/annotate.rs | 3 ++- crates/engine/src/cmd/annotate_dimedit.rs | 7 +++++-- crates/engine/src/cmd/annotate_qdim.rs | 6 ++++-- crates/engine/src/cmd/array.rs | 3 ++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/cmd/annoscale.rs b/crates/engine/src/cmd/annoscale.rs index 913cc5e6c..6ec2fb8f5 100644 --- a/crates/engine/src/cmd/annoscale.rs +++ b/crates/engine/src/cmd/annoscale.rs @@ -7,7 +7,8 @@ use cadcraft_doc::{AnnoScale, Drawing, EntityKind, Handle, MAX_SCALES, is_annota use serde_json::{Value, json}; use super::machines::{SelOutcome, SelectPhase, SelectRun}; -use super::*; +use super::{CommandSpec, bad, f64_req, targets}; + use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/annotate.rs b/crates/engine/src/cmd/annotate.rs index 87b0d063c..d371d85af 100644 --- a/crates/engine/src/cmd/annotate.rs +++ b/crates/engine/src/cmd/annotate.rs @@ -9,7 +9,8 @@ use serde_json::{Value, json}; use super::helpers::v3; use super::machines::{SelOutcome, SelectPhase, SelectRun}; -use super::*; +use super::{CommandSpec, bad, point_param, point_req, points_param, str_param, targets}; + use crate::{Accept, EngineError, Input, Interactive, LeaderOrder, MLeaderOptions, Prompt, Result, Session, Step}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/annotate_dimedit.rs b/crates/engine/src/cmd/annotate_dimedit.rs index 19538e0d5..87d1c2dca 100644 --- a/crates/engine/src/cmd/annotate_dimedit.rs +++ b/crates/engine/src/cmd/annotate_dimedit.rs @@ -5,8 +5,11 @@ use cadcraft_doc::{DimBreak, DimKind, Dimension, EntityKind, Handle, Inspection, use cadcraft_geom::{Segment, Vec2}; use serde_json::{Value, json}; -use super::machines::{SelOutcome, SelectPhase}; -use super::*; +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 crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; /// Most objects DIMBREAK Auto looks at, and most breaks it adds to one dimension. diff --git a/crates/engine/src/cmd/annotate_qdim.rs b/crates/engine/src/cmd/annotate_qdim.rs index 49e604f9a..06a7b4956 100644 --- a/crates/engine/src/cmd/annotate_qdim.rs +++ b/crates/engine/src/cmd/annotate_qdim.rs @@ -6,8 +6,10 @@ use cadcraft_doc::{DimKind, EntityKind, Handle, Prim}; use cadcraft_geom::{Segment, Vec2}; use serde_json::{Value, json}; -use super::machines::{SelOutcome, SelectPhase}; -use super::*; +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 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`)}"; diff --git a/crates/engine/src/cmd/array.rs b/crates/engine/src/cmd/array.rs index 04cbda225..479b7873a 100644 --- a/crates/engine/src/cmd/array.rs +++ b/crates/engine/src/cmd/array.rs @@ -17,7 +17,8 @@ use serde_json::{Value, json}; use super::helpers::{line, v3}; use super::machines::{SelOutcome, SelectPhase, number}; use super::modify::transform_entities; -use super::*; +use super::{CommandSpec, bad, bool_or, f64_or, find_command, point_param, point_req, str_param, targets}; + use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step}; mod edit;