Merge pull request #4214 from storytold/revert-4200-4203

Revert #4200 and #4203: their explicit imports don't compile

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";

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;

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();

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()

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};
 

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();

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();

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();

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();

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();

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 };

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");
 

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.

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};

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.

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;

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).

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 names

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 {

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![]);

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;

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;
 

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.