Compare commits

..
Author SHA1 Message Date
Dylan M. TaylorandClaude Sonnet 5.5 dd2dacdc2d refactor: replace wildcard imports with explicit ones (S2208, batch_02)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-24 08:51:39 +00:00
12 changed files with 23 additions and 28 deletions
+2 -1
View File
@@ -12,7 +12,8 @@ use serde_json::Value;
use super::added;
use super::curves::MAX_GEN;
use super::machines::number;
use super::*;
use super::{CommandSpec, line, lwpoly, point_param, point_req, size_param, str_param};
use crate::cmd::modify2::as_lwpoly;
use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
+2 -1
View File
@@ -11,7 +11,8 @@ use serde_json::{Value, json};
use super::curves::{self, MAX_GEN};
use super::machines::number;
use super::*;
use super::{CommandSpec, bad, bool_or, distinct_points, f64_or, line, ok, point_req, points_param, str_param};
use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
pub fn specs() -> Vec<CommandSpec> {
+2 -1
View File
@@ -8,7 +8,8 @@ use cadcraft_doc::{EntityKind, Handle};
use serde_json::{Value, json};
use super::machines::{SelOutcome, SelectPhase, SelectRun};
use super::*;
use super::{CommandSpec, EngineError, bad, ok, targets};
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
pub fn specs() -> Vec<CommandSpec> {
+2 -1
View File
@@ -5,7 +5,8 @@ use cadcraft_geom::{Bounds2, Mat3, Vec2};
use serde_json::{Value, json};
use super::machines::{SelOutcome, SelectPhase, SelectRun};
use super::*;
use super::{CommandSpec, EngineError, bad, bool_or, clipboard, f64_or, point_param, points_param, str_param, targets};
use crate::undoctl::Control;
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
+3 -2
View File
@@ -18,7 +18,8 @@ use cadcraft_render::raster::{RasterOptions, View};
use serde_json::{Value, json};
use super::file::{base64_decode, base64_encode, io};
use super::*;
use super::{CommandSpec, bad, point_value, resolve_alias, str_param};
use crate::{EngineError, Result, Session};
/// Formats EXPORT writes (the io layer picks the writer from the extension).
@@ -557,7 +558,7 @@ mod tests {
use cadcraft_geom::Vec3;
use super::super::file::{IoHooks, set_io};
use super::*;
use super::{CommandSpec, bad, point_value, resolve_alias, str_param};
static DELIVERED: std::sync::Mutex<Vec<(String, String, usize)>> = std::sync::Mutex::new(Vec::new());
+3 -2
View File
@@ -11,7 +11,8 @@ use cadcraft_doc::Drawing;
pub use cadcraft_dxf::Version;
use serde_json::{Value, json};
use super::*;
use super::{CommandSpec, EngineError, Interactive, bad, bool_or, ok, str_param};
use crate::{Accept, Input, Prompt, Result, Session, Step};
/// The rules the Command Aliases dialog checks before it sends an alias to ALIASEDIT.
@@ -720,7 +721,7 @@ mod tests {
#[cfg(test)]
mod pr193_tests {
use super::*;
use super::{CommandSpec, EngineError, Interactive, bad, bool_or, ok, str_param};
#[test]
fn failed_store_keeps_unsaved_changes_and_delivered_save_clears_them() {
+1 -2
View File
@@ -9,8 +9,7 @@ use serde_json::{Value, json};
use super::helpers::v3;
use super::machines::{SelOutcome, SelectPhase};
use super::{CommandSpec, bad, point_req, points_param, str_param, targets};
use super::*;
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
/// Most arrowheads added by one call, and most multileaders aligned / collected by one call.
+2 -4
View File
@@ -7,12 +7,10 @@ use cadcraft_geom::{
};
use serde_json::{Value, json};
use super::helpers::{arc, circle, line, lwpoly, v3};
use super::helpers::*;
use super::machines::{SelOutcome, SelectPhase, number};
use super::trimextend::{self, TrimM};
use super::{CommandSpec, bad, bool_or, f64_or, f64_req, point_param, point_req, points_param, str_param, targets};
use super::*;
use crate::select::{SelectKind, SelectMode};
use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
+2 -4
View File
@@ -9,11 +9,9 @@ use cadcraft_geom::{
use serde_json::{Value, json};
use super::curves::{self, Chain, MAX_GEN, TanObj};
use super::helpers::{arc, line, lwpoly, v3};
use super::helpers::*;
use super::machines::{SelOutcome, SelectPhase, number};
use super::{CommandSpec, bad, bool_or, f64_or, f64_req, point_param, point_req, str_param, targets};
use super::*;
use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
mod curve_edits;
@@ -1,9 +1,7 @@
//! PEDIT Edit vertex: Break and Straighten between two marked vertices, Tangent directions
//! that Fit honours, and Regen.
use super::{
EntityKind, Handle, Input, LwPolyline, PPhase, PeditM, PolyVertex, Result, Session, Value, Vec2, bad, curves, json, other, push_entity, set_kind,
};
use super::*;
fn ordered(pl: &LwPolyline, i: usize, j: usize) -> Result<(usize, usize)> {
let n = pl.vertices.len();
+1 -4
View File
@@ -6,10 +6,7 @@
//! 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::{
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,
};
use super::*;
/// The spline after a JSON SPLINEDIT option (`option` plus that option's parameters).
pub(super) fn run_splinedit(s: &mut Session, p: &Value) -> Result<Value> {
+2 -3
View File
@@ -8,8 +8,7 @@
use serde_json::{Map, Value, json};
use super::{CommandSpec, bad};
use super::*;
use crate::{Result, Session, Settings};
/// The profile variables, in the order [`profile`] lists them.
@@ -178,7 +177,7 @@ fn run_options(s: &mut Session, p: &Value) -> Result<Value> {
#[cfg(test)]
mod tests {
use super::{CommandSpec, bad};
use super::*;
#[test]
fn every_profile_var_round_trips_through_restore() {