VectorCraft: An open-source, vector art tool written by scratch in pure Rust
Revert "Merge pull request #4203 from storytold/fix/sonar-s2208-remaining"
bflatasticf5c528069fc0
diff --git a/crates/pdf/src/tests_text_placement.rs b/crates/pdf/src/tests_text_placement.rsindex 93925ad2d..fc0057a90 100644--- a/crates/pdf/src/tests_text_placement.rs+++ b/crates/pdf/src/tests_text_placement.rs@@ -12,7 +12,7 @@ use vectorcraft_testkit::pdf::{PdfPage, first_extra, pdf_with};use vectorcraft_text::{FontDb, FontFace};use crate::tests_import_fidelity::stream;-use crate::{ImportOptions, import_with_report};+use crate::*;const SOURCE_SANS: &[u8] = include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf");diff --git a/crates/render/src/tests_bitmapglyphs.rs b/crates/render/src/tests_bitmapglyphs.rsindex 22f7d7af9..eddff0c36 100644--- a/crates/render/src/tests_bitmapglyphs.rs+++ b/crates/render/src/tests_bitmapglyphs.rs@@ -6,7 +6,7 @@ use vectorcraft_doc::{Node, NodeKind};use vectorcraft_geom::Point;use vectorcraft_text::test_fonts::{COLOUR_CHAR, COLOUR_LARGE, colour_bitmap_family, colour_bitmap_font};-use super::{Affine, Document, RenderOptions, Rendered, Renderer};+use super::*;/// 100 pt [`COLOUR_CHAR`] in the colour bitmap test font (`sbix` or `CBDT`), filled blue, its/// baseline at (20, 120), on a white 160×160 page.diff --git a/crates/render/src/tests_changed.rs b/crates/render/src/tests_changed.rsindex 462c4c1ef..108e7604e 100644--- a/crates/render/src/tests_changed.rs+++ b/crates/render/src/tests_changed.rs@@ -1,6 +1,6 @@//! Drawing again only what an edit changed gives the pixels of drawing it all again.-use super::{Affine, Arc, Changed, Document, Node, NodeId, NodeKind, Rect, RenderOptions, Rendered, Renderer, changed, kurbo, view_pixels};+use super::*;use vectorcraft_color::{Color, Paint};use vectorcraft_doc::Appearance;use vectorcraft_geom::{Point, shapes};diff --git a/crates/render/src/tests_colrglyphs.rs b/crates/render/src/tests_colrglyphs.rsindex 1a0a80dce..38f07f888 100644--- a/crates/render/src/tests_colrglyphs.rs+++ b/crates/render/src/tests_colrglyphs.rs@@ -7,7 +7,7 @@ use vectorcraft_doc::{Node, NodeKind};use vectorcraft_geom::Point;use vectorcraft_text::test_fonts::{COLOUR_CHAR, COLR_SWEEP_CHAR, colr_family, colr_font};-use super::{Affine, Document, RenderOptions, Rendered, Renderer};+use super::*;/// 100 pt `text` in the COLR test font (v1 or v0), filled magenta, its baseline at (20, 120)/// turned by `turn` about there, on a white 160×160 page.diff --git a/crates/render/src/tests_dither.rs b/crates/render/src/tests_dither.rsindex 1ed4713de..55e70e88e 100644--- a/crates/render/src/tests_dither.rs+++ b/crates/render/src/tests_dither.rs@@ -1,7 +1,7 @@//! Dithered gradient fills: fine noise instead of bands, the same colours on average, the same//! pixels on every render, and nothing changed without dither or on strokes.-use super::{Affine, Document, Rect, RenderOptions, Rendered, Renderer, dither};+use super::*;use vectorcraft_color::{Color, Gradient, GradientKind, GradientPaint, GradientStop, Paint};use vectorcraft_doc::{Appearance, Node};use vectorcraft_geom::shapes;diff --git a/crates/scriptcheck/src/analyze.rs b/crates/scriptcheck/src/analyze.rsindex 47c0041ff..f16b86c57 100644--- a/crates/scriptcheck/src/analyze.rs+++ b/crates/scriptcheck/src/analyze.rs@@ -34,7 +34,7 @@ mod sig;pub(crate) use declared::{Declared, declarations};use features::platform_name;-use sig::{COMPOUND, LineBreaks, Read, Sig, ends_value, for_in, goes_on_after, goes_on_with, is, member_mark, word};+use sig::*;/// An `#include` line: what it names, its line, and the folders `#includepath` named at that point/// (one list, shared by every line it applies to).diff --git a/crates/scriptcheck/src/analyze/declared.rs b/crates/scriptcheck/src/analyze/declared.rsindex e66288847..2f790a347 100644--- a/crates/scriptcheck/src/analyze/declared.rs+++ b/crates/scriptcheck/src/analyze/declared.rs@@ -1,7 +1,6 @@//! The names declared, read before the analysis.-use super::sig::{LineBreaks, Read, Sig, for_in, goes_on_after, goes_on_with, is, member_mark, word};-use super::{Acc, Brackets, HashSet, Lexer, T};+use super::*;/// The names a file's function bodies and its global code declare, read before the analysis. A/// function's `var` statements and the function declarations directly in its body make the namesdiff --git a/crates/scriptcheck/src/analyze/features.rs b/crates/scriptcheck/src/analyze/features.rsindex 0a367c25d..0a8ba97d8 100644--- a/crates/scriptcheck/src/analyze/features.rs+++ b/crates/scriptcheck/src/analyze/features.rs@@ -1,7 +1,6 @@//! The platform features, menu commands and later syntax the analysis recognises.-use super::sig::{NEWER, Sig, is, member_mark, newer_number, unquote, word};-use super::{Analyzer, FeatureId, OutsideId, Pending, T, catalog, report};+use super::*;/// A global name of the platform the report looks for (`$`, `File`, `Socket`, `alert`, `eval`…).pub(super) fn platform_name(n: &str) -> bool {diff --git a/crates/text/src/tests_bitmaps.rs b/crates/text/src/tests_bitmaps.rsindex 8e284ccda..f28656d4a 100644--- a/crates/text/src/tests_bitmaps.rs+++ b/crates/text/src/tests_bitmaps.rs@@ -7,7 +7,7 @@ use skrifa::instance::{LocationRef, Size};use vectorcraft_doc::CharStyle;use super::test_fonts::{COLOUR_CBDT_BEARINGS, COLOUR_CHAR, COLOUR_PPEM, colour_bitmap_family, colour_bitmap_font};-use super::{Affine, FontDb, PositionedGlyph, TextObject, layout, system_font_dirs};+use super::*;fn db(sbix: bool) -> FontDb {let db = FontDb::with_font_dirs(vec![]);diff --git a/crates/text/src/tests_hang.rs b/crates/text/src/tests_hang.rsindex 18606b744..e59d89062 100644--- a/crates/text/src/tests_hang.rs+++ b/crates/text/src/tests_hang.rs@@ -3,7 +3,7 @@//! paragraphs" › Hanging punctuation,//! <https://helpx.adobe.com/illustrator/using/formatting-paragraphs.html>).-use super::{FontDb, Point, PositionedGlyph, Rect, TextObject, layout};+use super::*;use kurbo::{Affine, Shape};use vectorcraft_doc::{CharStyle, Composer, Justify, TextKind};use vectorcraft_geom::PathData;diff --git a/crates/ui-egui/src/layout_migration_tests.rs b/crates/ui-egui/src/layout_migration_tests.rsindex 393b701f8..615108598 100644--- a/crates/ui-egui/src/layout_migration_tests.rs+++ b/crates/ui-egui/src/layout_migration_tests.rs@@ -1,4 +1,4 @@-use super::{CANVAS, COLUMN_MAX, Column, Floating, Layout, Node, ReadPreferences, UiState, Value, docking};+use super::*;use craft_ui::docking::Side;use serde_json::json;diff --git a/crates/ui-egui/src/panel_docking_native_tests.rs b/crates/ui-egui/src/panel_docking_native_tests.rsindex 4fb5af706..41edab720 100644--- a/crates/ui-egui/src/panel_docking_native_tests.rs+++ b/crates/ui-egui/src/panel_docking_native_tests.rs@@ -11,8 +11,7 @@ use std::sync::Arc;use egui::{Event, Key, Pos2, Rect, ViewportCommand, ViewportId, pos2, vec2};use vectorcraft_engine::Session;-use super::{VectorcraftApp, area_id, floating_window, inspect, layout_of};-use serde_json::{Value, json};+use super::*;const SCREEN: Rect = Rect::from_min_max(Pos2::ZERO, pos2(1600.0, 1000.0));/// Where the main window's content sits on the desktop.