From 85f3946476ca02b5d5d5a48c2e43cb7c3ed25d06 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 24 Oct 2026 20:43:56 -0400 Subject: [PATCH] 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 | 2 +- crates/engine/src/cmd/annotate_dimedit.rs | 6 ++++-- crates/engine/src/cmd/annotate_qdim.rs | 5 +++-- crates/engine/src/cmd/array.rs | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/engine/src/cmd/annoscale.rs b/crates/engine/src/cmd/annoscale.rs index e4cc0a196..6ec2fb8f5 100644 --- a/crates/engine/src/cmd/annoscale.rs +++ b/crates/engine/src/cmd/annoscale.rs @@ -7,7 +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, ok, targets}; +use super::{CommandSpec, bad, f64_req, targets}; use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; diff --git a/crates/engine/src/cmd/annotate_dimedit.rs b/crates/engine/src/cmd/annotate_dimedit.rs index 09be36760..87d1c2dca 100644 --- a/crates/engine/src/cmd/annotate_dimedit.rs +++ b/crates/engine/src/cmd/annotate_dimedit.rs @@ -5,8 +5,10 @@ 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::{CommandSpec, bad, bool_or, point_param, point_req, size_param, str_param, targets}; +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}; diff --git a/crates/engine/src/cmd/annotate_qdim.rs b/crates/engine/src/cmd/annotate_qdim.rs index a897325b6..06a7b4956 100644 --- a/crates/engine/src/cmd/annotate_qdim.rs +++ b/crates/engine/src/cmd/annotate_qdim.rs @@ -6,8 +6,9 @@ use cadcraft_doc::{DimKind, EntityKind, Handle, Prim}; use cadcraft_geom::{Segment, Vec2}; use serde_json::{Value, json}; -use super::machines::{SelOutcome, SelectPhase}; -use super::{bad, key, point_param, point_req, points_param, str_param, targets}; +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}; diff --git a/crates/engine/src/cmd/array.rs b/crates/engine/src/cmd/array.rs index e84f6d616..479b7873a 100644 --- a/crates/engine/src/cmd/array.rs +++ b/crates/engine/src/cmd/array.rs @@ -1172,7 +1172,7 @@ impl Interactive for PolarM { #[cfg(test)] mod tests { - use super::{CommandSpec, bad, bool_or, f64_or, find_command, point_param, point_req, str_param, targets}; + use super::*; fn polar(n: u32, fill: f64) -> ArrayParams { let kind = ArrayKind::Polar(PolarArray { center: -Vec2::X, items: n, fill, rotate: true, rows: 1, row_spacing: 0.0, row_elevation: 0.0 });