From 6b7ccaf213992c58599fb7eb5892b17e4e580eab Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 24 Oct 2026 08:52:19 +0000 Subject: [PATCH] refactor: replace wildcard imports with explicit ones (S2208, batch_06) --- crates/engine/src/cmd/mleader_edit.rs | 3 ++- crates/engine/src/cmd/modify.rs | 6 ++++-- crates/engine/src/cmd/modify2.rs | 6 ++++-- crates/engine/src/cmd/modify2/pedit_vertex.rs | 4 +++- crates/engine/src/cmd/modify2/splinedit.rs | 5 ++++- crates/engine/src/cmd/options.rs | 5 +++-- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/crates/engine/src/cmd/mleader_edit.rs b/crates/engine/src/cmd/mleader_edit.rs index 1416d71ab..e8e50bbf8 100644 --- a/crates/engine/src/cmd/mleader_edit.rs +++ b/crates/engine/src/cmd/mleader_edit.rs @@ -9,7 +9,8 @@ use serde_json::{Value, json}; use super::helpers::v3; use super::machines::{SelOutcome, SelectPhase}; -use super::*; +use super::{CommandSpec, bad, point_req, points_param, str_param, targets}; + use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step}; /// Most arrowheads added by one call, and most multileaders aligned / collected by one call. diff --git a/crates/engine/src/cmd/modify.rs b/crates/engine/src/cmd/modify.rs index 6c350e407..c25eb50c8 100644 --- a/crates/engine/src/cmd/modify.rs +++ b/crates/engine/src/cmd/modify.rs @@ -7,10 +7,12 @@ use cadcraft_geom::{ }; use serde_json::{Value, json}; -use super::helpers::*; +use super::helpers::{arc, circle, line, lwpoly, v3}; + use super::machines::{SelOutcome, SelectPhase, number}; use super::trimextend::{self, TrimM}; -use super::*; +use super::{CommandSpec, bad, bool_or, f64_or, f64_req, point_param, point_req, points_param, str_param, targets}; + use crate::select::{SelectKind, SelectMode}; use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step}; diff --git a/crates/engine/src/cmd/modify2.rs b/crates/engine/src/cmd/modify2.rs index e6493e526..27327b13b 100644 --- a/crates/engine/src/cmd/modify2.rs +++ b/crates/engine/src/cmd/modify2.rs @@ -9,9 +9,11 @@ use cadcraft_geom::{ use serde_json::{Value, json}; use super::curves::{self, Chain, MAX_GEN, TanObj}; -use super::helpers::*; +use super::helpers::{arc, line, lwpoly, v3}; + use super::machines::{SelOutcome, SelectPhase, number}; -use super::*; +use super::{CommandSpec, bad, bool_or, f64_or, f64_req, point_param, point_req, str_param, targets}; + use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step}; mod curve_edits; diff --git a/crates/engine/src/cmd/modify2/pedit_vertex.rs b/crates/engine/src/cmd/modify2/pedit_vertex.rs index be0d5d383..68d63ea3d 100644 --- a/crates/engine/src/cmd/modify2/pedit_vertex.rs +++ b/crates/engine/src/cmd/modify2/pedit_vertex.rs @@ -1,7 +1,9 @@ //! PEDIT Edit vertex: Break and Straighten between two marked vertices, Tangent directions //! that Fit honours, and Regen. -use super::*; +use super::{ + EntityKind, Handle, Input, LwPolyline, PPhase, PeditM, PolyVertex, Result, Session, Value, Vec2, bad, curves, json, other, push_entity, set_kind, +}; fn ordered(pl: &LwPolyline, i: usize, j: usize) -> Result<(usize, usize)> { let n = pl.vertices.len(); diff --git a/crates/engine/src/cmd/modify2/splinedit.rs b/crates/engine/src/cmd/modify2/splinedit.rs index 212433ea7..2b853c675 100644 --- a/crates/engine/src/cmd/modify2/splinedit.rs +++ b/crates/engine/src/cmd/modify2/splinedit.rs @@ -6,7 +6,10 @@ //! parametrisation, end tangents and fit tolerance. Control-point edits change the curve //! directly and drop the fit data, as the curve no longer follows it. -use super::*; +use super::{ + Accept, Entity, EntityKind, Handle, Input, Interactive, LwPolyline, MAX_GEN, PolyVertex, Prompt, Result, SelOutcome, SelectPhase, Session, Space, + Spline, Step, Value, Vec2, bad, bool_or, curves, f64_req, json, line, number, other, point_req, set_kind, str_param, targets, +}; /// The spline after a JSON SPLINEDIT option (`option` plus that option's parameters). pub(super) fn run_splinedit(s: &mut Session, p: &Value) -> Result { diff --git a/crates/engine/src/cmd/options.rs b/crates/engine/src/cmd/options.rs index 9dbeeddbf..8c5d47f10 100644 --- a/crates/engine/src/cmd/options.rs +++ b/crates/engine/src/cmd/options.rs @@ -8,7 +8,8 @@ use serde_json::{Map, Value, json}; -use super::*; +use super::{CommandSpec, bad}; + use crate::{Result, Session, Settings}; /// The profile variables, in the order [`profile`] lists them. @@ -177,7 +178,7 @@ fn run_options(s: &mut Session, p: &Value) -> Result { #[cfg(test)] mod tests { - use super::*; + use super::{CommandSpec, bad}; #[test] fn every_profile_var_round_trips_through_restore() {