diff --git a/crates/engine/src/cmd/file/eps_place_tests.rs b/crates/engine/src/cmd/file/eps_place_tests.rs index 9b2c89da9..740e2b56a 100644 --- a/crates/engine/src/cmd/file/eps_place_tests.rs +++ b/crates/engine/src/cmd/file/eps_place_tests.rs @@ -3,7 +3,7 @@ //! These helpers write real files, so they live in their own `_tests.rs` file: the //! file-system guard in `tests_file_guard.rs` checks `src` files but exempts test ones. -use super::*; +use super::{Arc, AssetId, ItemId, Session, base64_encode, json}; pub(crate) fn tiff_eps() -> Vec { let mut tiff = b"II".to_vec(); diff --git a/crates/engine/src/tests_ime.rs b/crates/engine/src/tests_ime.rs index 266470914..def3b6cc0 100644 --- a/crates/engine/src/tests_ime.rs +++ b/crates/engine/src/tests_ime.rs @@ -4,7 +4,7 @@ use designcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey}; use serde_json::json; -use super::*; +use super::{Arc, ViewInfo}; fn session() -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests_table.rs b/crates/engine/src/tests_table.rs index 2fc4fd338..28387f19c 100644 --- a/crates/engine/src/tests_table.rs +++ b/crates/engine/src/tests_table.rs @@ -1,6 +1,6 @@ use serde_json::json; -use super::*; +use super::doc; fn session_with_frame() -> (Session, u64, u64) { let mut s = Session::new(); diff --git a/crates/fonts/src/tests_docfonts.rs b/crates/fonts/src/tests_docfonts.rs index 67b1d8748..7d22ece3d 100644 --- a/crates/fonts/src/tests_docfonts.rs +++ b/crates/fonts/src/tests_docfonts.rs @@ -4,7 +4,7 @@ use std::path::{Path, PathBuf}; -use super::*; +use super::{Arc, DOCUMENT_FONTS_FOLDER, FALLBACK_FAMILY, FontDb, FontSource, MAX_DOCUMENT_FONT_BYTES, MAX_DOCUMENT_FONT_FILES}; use crate::testing::{font_with, font_with_names, font_with_wws, with_fs_type}; /// An empty temporary folder unique to `name` and this process. diff --git a/crates/fonts/src/tests_fallback.rs b/crates/fonts/src/tests_fallback.rs index d9e27ac62..9ed897d3d 100644 --- a/crates/fonts/src/tests_fallback.rs +++ b/crates/fonts/src/tests_fallback.rs @@ -1,6 +1,6 @@ //! CJK fallback follows the character's language (and the script where it is unambiguous). -use super::*; +use super::FontDb; use crate::testing::font_with; const HAN: char = '直'; diff --git a/crates/fonts/src/tests_vertical.rs b/crates/fonts/src/tests_vertical.rs index 3fdf91b3b..bf48ac426 100644 --- a/crates/fonts/src/tests_vertical.rs +++ b/crates/fonts/src/tests_vertical.rs @@ -5,7 +5,7 @@ use skrifa::raw::TableProvider; -use super::*; +use super::{Arc, FontBytes, FontDb, FontFace, FontSource, GlyphId, LocationRef, Size, make_face}; use crate::testing::{font_mapping, font_with, with_base, with_code_pages, with_table_len, with_table_u16, with_vmtx, with_vorg}; use crate::{ShapeContext, feature, shape_vertical, shape_with_context}; diff --git a/crates/pdf/src/rtl_tests.rs b/crates/pdf/src/rtl_tests.rs index 53db2ac25..82974029e 100644 --- a/crates/pdf/src/rtl_tests.rs +++ b/crates/pdf/src/rtl_tests.rs @@ -8,7 +8,7 @@ use designcraft_doc::{Align, Document, ParaAttrs, ParaFormat, SpreadRef, TextDir use designcraft_geom::Rect; use crate::tests::extract_text; -use crate::*; +use crate::{PdfOptions, export_pdf}; const HEBREW: &str = "DC Test PDF Hebrew"; const ARABIC: &str = "DC Test PDF Arabic"; diff --git a/crates/ui-egui/src/guide_selection_tests.rs b/crates/ui-egui/src/guide_selection_tests.rs index d69026712..9d8dc1add 100644 --- a/crates/ui-egui/src/guide_selection_tests.rs +++ b/crates/ui-egui/src/guide_selection_tests.rs @@ -4,7 +4,7 @@ use egui::{Event, Modifiers, PointerButton}; use egui_kittest::Harness; -use super::*; +use super::{CanvasLayout, Mods, Overlay, Point, Pos2, RULER, SpreadRef, ToolKey, Xf, json, pos2, vec2}; fn harness(app: DesignApp) -> Harness<'static, DesignApp> { let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).build_ui_state( diff --git a/crates/ui-egui/src/panel_docking_tests.rs b/crates/ui-egui/src/panel_docking_tests.rs index f436cfb5e..9be8afd56 100644 --- a/crates/ui-egui/src/panel_docking_tests.rs +++ b/crates/ui-egui/src/panel_docking_tests.rs @@ -1,4 +1,4 @@ -use super::*; +use super::{Layout, Node, cancel_gesture, json, valid}; use egui::{Event, Modifiers, PointerButton, Pos2, vec2}; use egui_kittest::{Harness, kittest::Queryable}; diff --git a/crates/ui-egui/src/parent_canvas_tests.rs b/crates/ui-egui/src/parent_canvas_tests.rs index b3197a7e0..6a84519af 100644 --- a/crates/ui-egui/src/parent_canvas_tests.rs +++ b/crates/ui-egui/src/parent_canvas_tests.rs @@ -1,4 +1,4 @@ -use super::*; +use super::{CanvasLayout, Color32, Point, Pos2, Rect, View, Xf, json, render_texture, vec2}; fn app_with_document_object() -> DesignApp { let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());