From a54251a18a95fd9aa406c3406fe245d8410dd808 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Mon, 26 Oct 2026 09:56:24 +0700 Subject: [PATCH] Revert "Merge pull request #4200 from storytold/fix/sonar-s2208-engine-tests" This reverts commit d7a2591dc0a89dc9a7ebc7fadc559f859f743017, reversing changes made to e63c26ff15218a759f589de05a98e6c74b940fe9. --- crates/engine/src/cmd/globaledit.rs | 2 +- crates/engine/src/cmd/symbollib.rs | 2 +- crates/engine/src/tests_colourfonts.rs | 2 +- crates/engine/src/tests_compoundpaint.rs | 2 +- crates/engine/src/tests_constrain_new.rs | 2 +- crates/engine/src/tests_constrain_tools.rs | 2 +- crates/engine/src/tests_globaledit.rs | 2 +- crates/engine/src/tests_simplify_part.rs | 2 +- crates/engine/src/tests_symbollib.rs | 2 +- crates/engine/src/tests_transformfx.rs | 2 +- crates/engine/src/tests_trap.rs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/engine/src/cmd/globaledit.rs b/crates/engine/src/cmd/globaledit.rs index bc2e7a26b..c015ffaa2 100644 --- a/crates/engine/src/cmd/globaledit.rs +++ b/crates/engine/src/cmd/globaledit.rs @@ -51,7 +51,7 @@ use vectorcraft_doc::{Appearance, AppearanceItem, Document, FillLayer, Node, Nod use vectorcraft_geom::{Affine, BezPath, PathData, Point, Rect, Shape}; use super::wand::{fill_of, stroke_of}; -use super::{CommandSpec, Result, Session, bad, bool_or, has_doc}; +use super::*; const C: &str = "select.globalEdit"; const OPTIONS: &str = "select.globalEditOptions"; diff --git a/crates/engine/src/cmd/symbollib.rs b/crates/engine/src/cmd/symbollib.rs index fd9b5c239..557eb9ba6 100644 --- a/crates/engine/src/cmd/symbollib.rs +++ b/crates/engine/src/cmd/symbollib.rs @@ -20,7 +20,7 @@ use super::clipboard::Clipboard; use super::clipboard::resources::SwatchChoices; use super::swatch::str_list; use super::swatchlib::{FileData, LibraryFile, LibraryInfo, stem}; -use super::{CommandSpec, Result, Session, always, bad, bool_or, has_doc, number_or, str_param}; +use super::*; /// The extension of saved symbol libraries: native documents. pub const SYMBOLS_EXT: &str = vectorcraft_format::EXTENSION; diff --git a/crates/engine/src/tests_colourfonts.rs b/crates/engine/src/tests_colourfonts.rs index 507bee2b8..1e62fac02 100644 --- a/crates/engine/src/tests_colourfonts.rs +++ b/crates/engine/src/tests_colourfonts.rs @@ -5,7 +5,7 @@ use serde_json::{Value, json}; use vectorcraft_doc::NodeKind; use vectorcraft_text::test_fonts::{SVG_CHAR, source_sans_gid, svg_font}; -use super::{NodeId, Session}; +use super::*; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_compoundpaint.rs b/crates/engine/src/tests_compoundpaint.rs index a6899ea8a..8c81ef2ce 100644 --- a/crates/engine/src/tests_compoundpaint.rs +++ b/crates/engine/src/tests_compoundpaint.rs @@ -4,7 +4,7 @@ use serde_json::{Value, json}; use vectorcraft_color::Paint; -use super::{NodeId, Session}; +use super::*; fn run(s: &mut Session, id: &str, p: Value) -> Value { s.execute(id, &p).unwrap() diff --git a/crates/engine/src/tests_constrain_new.rs b/crates/engine/src/tests_constrain_new.rs index 9384b7d5c..3a53333c5 100644 --- a/crates/engine/src/tests_constrain_new.rs +++ b/crates/engine/src/tests_constrain_new.rs @@ -8,7 +8,7 @@ use vectorcraft_doc::{LiveShape, NodeKind, TextKind}; use vectorcraft_geom::{PathData, Point, Rect}; use vectorcraft_tools::{Mods, PointerEvent, PointerKind}; -use super::{NodeId, Session, ViewInfo, constrain_click}; +use super::*; use PointerKind::{Down, Drag, Up}; diff --git a/crates/engine/src/tests_constrain_tools.rs b/crates/engine/src/tests_constrain_tools.rs index a1da7e61c..357f588fd 100644 --- a/crates/engine/src/tests_constrain_tools.rs +++ b/crates/engine/src/tests_constrain_tools.rs @@ -7,7 +7,7 @@ use vectorcraft_doc::{LiveShape, NodeKind}; use vectorcraft_geom::{Point, Vec2}; use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey}; -use super::{NodeId, Session, ViewInfo}; +use super::*; fn new_doc() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_globaledit.rs b/crates/engine/src/tests_globaledit.rs index 566469194..c928d1712 100644 --- a/crates/engine/src/tests_globaledit.rs +++ b/crates/engine/src/tests_globaledit.rs @@ -6,7 +6,7 @@ use serde_json::{Value, json}; use vectorcraft_doc::{Node, NodeKind}; use vectorcraft_geom::{Affine, PathData, Rect}; -use super::{EngineError, NodeId, Session}; +use super::*; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_simplify_part.rs b/crates/engine/src/tests_simplify_part.rs index 6e88af96e..4f600f68a 100644 --- a/crates/engine/src/tests_simplify_part.rs +++ b/crates/engine/src/tests_simplify_part.rs @@ -10,7 +10,7 @@ use vectorcraft_doc::NodeKind; use vectorcraft_geom::kurbo::ParamCurveNearest; use vectorcraft_geom::{ParamCurve, PathData, SubPath}; -use super::{NodeId, Session}; +use super::*; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_symbollib.rs b/crates/engine/src/tests_symbollib.rs index 81374ebb7..eed7229ef 100644 --- a/crates/engine/src/tests_symbollib.rs +++ b/crates/engine/src/tests_symbollib.rs @@ -6,7 +6,7 @@ use serde_json::{Value, json}; use vectorcraft_doc::{NodeId, NodeKind, SymbolRegistration}; -use super::{Session, cmd}; +use super::*; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_transformfx.rs b/crates/engine/src/tests_transformfx.rs index 864b2d84f..7fdda3928 100644 --- a/crates/engine/src/tests_transformfx.rs +++ b/crates/engine/src/tests_transformfx.rs @@ -5,7 +5,7 @@ use serde_json::{Value, json}; use vectorcraft_doc::Node; -use super::{NodeId, Session}; +use super::*; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_trap.rs b/crates/engine/src/tests_trap.rs index 3c88f1500..87fb92a6f 100644 --- a/crates/engine/src/tests_trap.rs +++ b/crates/engine/src/tests_trap.rs @@ -5,7 +5,7 @@ use vectorcraft_color::{Color, Paint}; use vectorcraft_doc::{Node, NodeKind}; use vectorcraft_geom::Rect; -use super::{NodeId, Session}; +use super::*; const YELLOW: Color = Color::Cmyk { c: 0.0, m: 0.0, y: 1.0, k: 0.0 }; const BLUE: Color = Color::Cmyk { c: 1.0, m: 0.6, y: 0.0, k: 0.0 };