From 96cd4b1b14a5d350ceeb9b8409adb9cf88879576 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 25 Oct 2026 21:36:22 -0400 Subject: [PATCH] lint: explicit imports in remaining test and module files (S2208) Replace glob imports (`use super::*`, `use crate::*`, `use sig::*`) with the names each file uses, in scriptcheck, pdf, render, text and ui-egui. No code changes. --- crates/pdf/src/tests_text_placement.rs | 2 +- crates/render/src/tests_bitmapglyphs.rs | 2 +- crates/render/src/tests_changed.rs | 2 +- crates/render/src/tests_colrglyphs.rs | 2 +- crates/render/src/tests_dither.rs | 2 +- crates/scriptcheck/src/analyze.rs | 2 +- crates/scriptcheck/src/analyze/declared.rs | 3 ++- crates/scriptcheck/src/analyze/features.rs | 3 ++- crates/text/src/tests_bitmaps.rs | 2 +- crates/text/src/tests_hang.rs | 2 +- crates/ui-egui/src/layout_migration_tests.rs | 2 +- crates/ui-egui/src/panel_docking_native_tests.rs | 3 ++- 12 files changed, 15 insertions(+), 12 deletions(-) diff --git a/crates/pdf/src/tests_text_placement.rs b/crates/pdf/src/tests_text_placement.rs index fc0057a90..93925ad2d 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::*; +use crate::{ImportOptions, import_with_report}; 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.rs index eddff0c36..22f7d7af9 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::*; +use super::{Affine, Document, RenderOptions, Rendered, Renderer}; /// 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.rs index 108e7604e..462c4c1ef 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::*; +use super::{Affine, Arc, Changed, Document, Node, NodeId, NodeKind, Rect, RenderOptions, Rendered, Renderer, changed, kurbo, view_pixels}; 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.rs index 38f07f888..1a0a80dce 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::*; +use super::{Affine, Document, RenderOptions, Rendered, Renderer}; /// 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.rs index 55e70e88e..1ed4713de 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::*; +use super::{Affine, Document, Rect, RenderOptions, Rendered, Renderer, dither}; 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.rs index f16b86c57..47c0041ff 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::*; +use sig::{COMPOUND, LineBreaks, Read, Sig, ends_value, for_in, goes_on_after, goes_on_with, is, member_mark, word}; /// 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.rs index 2f790a347..e66288847 100644 --- a/crates/scriptcheck/src/analyze/declared.rs +++ b/crates/scriptcheck/src/analyze/declared.rs @@ -1,6 +1,7 @@ //! The names declared, read before the analysis. -use super::*; +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}; /// 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 names diff --git a/crates/scriptcheck/src/analyze/features.rs b/crates/scriptcheck/src/analyze/features.rs index 0a8ba97d8..0a367c25d 100644 --- a/crates/scriptcheck/src/analyze/features.rs +++ b/crates/scriptcheck/src/analyze/features.rs @@ -1,6 +1,7 @@ //! The platform features, menu commands and later syntax the analysis recognises. -use super::*; +use super::sig::{NEWER, Sig, is, member_mark, newer_number, unquote, word}; +use super::{Analyzer, FeatureId, OutsideId, Pending, T, catalog, report}; /// 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.rs index f28656d4a..8e284ccda 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::*; +use super::{Affine, FontDb, PositionedGlyph, TextObject, layout, system_font_dirs}; 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.rs index e59d89062..18606b744 100644 --- a/crates/text/src/tests_hang.rs +++ b/crates/text/src/tests_hang.rs @@ -3,7 +3,7 @@ //! paragraphs" › Hanging punctuation, //! ). -use super::*; +use super::{FontDb, Point, PositionedGlyph, Rect, TextObject, layout}; 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.rs index 615108598..393b701f8 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::*; +use super::{CANVAS, COLUMN_MAX, Column, Floating, Layout, Node, ReadPreferences, UiState, Value, docking}; 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.rs index 41edab720..4fb5af706 100644 --- a/crates/ui-egui/src/panel_docking_native_tests.rs +++ b/crates/ui-egui/src/panel_docking_native_tests.rs @@ -11,7 +11,8 @@ use std::sync::Arc; use egui::{Event, Key, Pos2, Rect, ViewportCommand, ViewportId, pos2, vec2}; use vectorcraft_engine::Session; -use super::*; +use super::{VectorcraftApp, area_id, floating_window, inspect, layout_of}; +use serde_json::{Value, json}; const SCREEN: Rect = Rect::from_min_max(Pos2::ZERO, pos2(1600.0, 1000.0)); /// Where the main window's content sits on the desktop.