From 9eb72b66f3acacb4c96edf1b9f9f64dc25f6d03f Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 25 Oct 2026 15:12:28 +0000 Subject: [PATCH] fix: restore explicit imports in test modules (SonarCloud S2208) --- crates/engine/src/cmd/animation.rs | 2 +- crates/engine/src/cmd/arrange.rs | 5 ++++- crates/engine/src/cmd/artistic.rs | 2 +- crates/engine/src/cmd/background.rs | 7 ++++++- crates/engine/src/cmd/compress.rs | 2 +- crates/engine/src/cmd/design.rs | 3 ++- crates/engine/src/cmd/edit.rs | 5 ++++- crates/engine/src/cmd/file.rs | 2 +- crates/engine/src/cmd/find.rs | 2 +- crates/engine/src/cmd/format.rs | 6 +++++- crates/engine/src/cmd/ideas.rs | 2 +- crates/engine/src/cmd/insert.rs | 4 ++-- crates/engine/src/cmd/inspect.rs | 2 +- crates/engine/src/cmd/media.rs | 8 ++++++-- crates/engine/src/cmd/merge.rs | 9 +++++++-- crates/engine/src/cmd/picture_style.rs | 2 +- crates/engine/src/cmd/points.rs | 2 +- crates/engine/src/cmd/recolor.rs | 2 +- crates/engine/src/cmd/reuse.rs | 2 +- crates/engine/src/cmd/review.rs | 4 +++- crates/engine/src/cmd/selection.rs | 2 +- crates/engine/src/cmd/shape.rs | 6 ++++-- crates/engine/src/cmd/slide.rs | 2 +- crates/engine/src/cmd/smartart.rs | 2 +- crates/engine/src/cmd/table.rs | 4 ++-- crates/engine/src/cmd/text.rs | 3 ++- crates/engine/src/cmd/transition.rs | 2 +- crates/engine/src/cmd/zoom.rs | 2 +- crates/engine/src/tests.rs | 2 ++ crates/format/src/chart_parts_tests.rs | 7 +++++-- crates/model/src/tests.rs | 5 +++-- crates/pdf/src/tests.rs | 11 ++++++++++- crates/render/src/tests.rs | 5 +++-- crates/render/src/tests_wild.rs | 3 ++- crates/ui-egui/src/backstage_tests.rs | 2 +- 35 files changed, 89 insertions(+), 42 deletions(-) diff --git a/crates/engine/src/cmd/animation.rs b/crates/engine/src/cmd/animation.rs index 162c660e..eea77eb0 100644 --- a/crates/engine/src/cmd/animation.rs +++ b/crates/engine/src/cmd/animation.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use deckcraft_model::anim::{ANIMATIONS, AnimClass, AnimStart, Animation, TextBuild, animation_info}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, bool_or, bool_param, id_param, ok, str_param, targets, usize_param}; +use super::{CommandSpec, always, bad, bool_or, bool_param, cmd, has_selection, has_slide, id_param, ok, str_param, targets, usize_param}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/arrange.rs b/crates/engine/src/cmd/arrange.rs index 74df3de7..4157a1cf 100644 --- a/crates/engine/src/cmd/arrange.rs +++ b/crates/engine/src/cmd/arrange.rs @@ -4,7 +4,10 @@ use deckcraft_geom::{Point, Rect, Xfrm}; use deckcraft_model::{Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, edit_geometry, id_param, ok, str_param, targets, usize_param, with_param, xfrm_of}; +use super::{ + CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, edit_geometry, has_doc, has_selection, has_slide, has_two, id_param, ok, str_param, targets, + usize_param, with_param, xfrm_of, +}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/artistic.rs b/crates/engine/src/cmd/artistic.rs index 009991f3..7f65cd4a 100644 --- a/crates/engine/src/cmd/artistic.rs +++ b/crates/engine/src/cmd/artistic.rs @@ -9,7 +9,7 @@ use deckcraft_model::{MediaId, ShapeId, ShapeKind}; use image::{GrayImage, Rgba, RgbaImage}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, str_param, targets}; +use super::{CommandSpec, NO_ID_SPACE, bad, cmd, has_selection, str_param, targets}; use crate::{Result, Session}; /// The effects offered: `a14` element name and label. diff --git a/crates/engine/src/cmd/background.rs b/crates/engine/src/cmd/background.rs index dc80a112..1b50a54e 100644 --- a/crates/engine/src/cmd/background.rs +++ b/crates/engine/src/cmd/background.rs @@ -8,7 +8,7 @@ use std::collections::VecDeque; use deckcraft_model::{ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, base64_encode, f64_or, targets}; +use super::{CommandSpec, NO_ID_SPACE, bad, cmd, f64_or, has_selection, targets}; use crate::{Result, Session}; /// Larger pictures are refused rather than matted slowly (16 megapixels). @@ -184,7 +184,12 @@ fn remove_background(s: &mut Session, p: &Value) -> Result { #[cfg(test)] mod tests { + use deckcraft_model::{ShapeId, ShapeKind}; + use serde_json::json; + use super::*; + use crate::Session; + use crate::cmd::base64_encode; /// A red disc on a white-to-grey gradient. fn disc() -> image::RgbaImage { diff --git a/crates/engine/src/cmd/compress.rs b/crates/engine/src/cmd/compress.rs index 6fe1719a..5708efbb 100644 --- a/crates/engine/src/cmd/compress.rs +++ b/crates/engine/src/cmd/compress.rs @@ -8,7 +8,7 @@ use deckcraft_model::style::PictureFill; use deckcraft_model::{MediaId, Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, f64_param, targets}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, f64_param, has_doc, targets}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/design.rs b/crates/engine/src/cmd/design.rs index be7896a7..afa0ef92 100644 --- a/crates/engine/src/cmd/design.rs +++ b/crates/engine/src/cmd/design.rs @@ -11,7 +11,8 @@ use deckcraft_model::{Background, Fill, PhType, Presentation, Shape, ShapeId, de use serde_json::{Value, json}; use super::{ - CommandSpec, NO_ID_SPACE, bad, bool_or, bool_param, cmd, color_param, f64_param, ok, rect_param, shape, str_param, text, usize_param, with_param, + CommandSpec, NO_ID_SPACE, always, bad, bool_or, bool_param, cmd, color_param, color_value, f64_param, has_doc, has_slide, ok, rect_param, + str_param, usize_param, with_param, }; use crate::{Result, Session, Target}; diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs index a5858cbc..bd86b3b6 100644 --- a/crates/engine/src/cmd/edit.rs +++ b/crates/engine/src/cmd/edit.rs @@ -7,7 +7,10 @@ use deckcraft_model::text::TextBody; use deckcraft_model::{MediaId, Shape, ShapeId, Slide, SlideId}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, base64_encode, bool_or, id_param, ids_param, ok, richclip, str_param, targets, text, xfrm_of}; +use super::{ + CommandSpec, NO_ID_SPACE, bad, base64_encode, bool_or, can_redo, can_undo, cmd, has_doc, has_selection, has_slide, id_param, ids_param, ok, + richclip, str_param, targets, xfrm_of, +}; use crate::{HistoryEntry, Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs index 1c937e51..f21f2a3a 100644 --- a/crates/engine/src/cmd/file.rs +++ b/crates/engine/src/cmd/file.rs @@ -7,7 +7,7 @@ use deckcraft_media::MediaInfo; use deckcraft_model::{MediaId, MediaItem, Presentation, Shape, ShapeKind, defaults}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, base64_encode, bool_or, f64_or, ok, str_param, usize_param}; +use super::{CommandSpec, always, bad, base64_decode, base64_encode, bool_or, cmd, f64_or, has_doc, ok, str_param, usize_param}; use crate::{DocState, EngineError, Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/find.rs b/crates/engine/src/cmd/find.rs index 7feda9ac..4bf91f87 100644 --- a/crates/engine/src/cmd/find.rs +++ b/crates/engine/src/cmd/find.rs @@ -6,7 +6,7 @@ use deckcraft_model::text::RunKind; use deckcraft_model::{Paragraph, Shape, ShapeKind, Slide, TextBody}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, bool_or, str_param, text}; +use super::{CommandSpec, bad, bool_or, cmd, has_doc, str_param}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/format.rs b/crates/engine/src/cmd/format.rs index 1b375dc2..1a80528b 100644 --- a/crates/engine/src/cmd/format.rs +++ b/crates/engine/src/cmd/format.rs @@ -8,8 +8,12 @@ use deckcraft_model::{ColorRef, ColorTransform, Effects, Fill, Line, SchemeSlot, use serde_json::{Value, json}; use super::text::{format_body, format_para, format_run}; -use super::{CommandSpec, bad, bool_or, bool_param, color_param, edit_shapes, f64_or, f64_param, ids_param, ok, str_param}; +use super::{ + CommandSpec, always, bad, base64_decode, bool_or, bool_param, cmd, color_param, edit_shapes, f64_or, f64_param, has_doc, has_text, + has_text_or_shapes, ids_param, ok, str_param, +}; use crate::{Result, Session}; +use deckcraft_model::ShapeId; pub fn specs() -> Vec { vec![ diff --git a/crates/engine/src/cmd/ideas.rs b/crates/engine/src/cmd/ideas.rs index 25c71221..e6104426 100644 --- a/crates/engine/src/cmd/ideas.rs +++ b/crates/engine/src/cmd/ideas.rs @@ -8,7 +8,7 @@ use deckcraft_model::resolve::{self, Ctx}; use deckcraft_model::{Fill, Presentation, Rgba, Shape, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, str_param, text, usize_param, xfrm_of}; +use super::{CommandSpec, bad, cmd, has_slide, str_param, usize_param, xfrm_of}; use crate::{Result, Selection, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/insert.rs b/crates/engine/src/cmd/insert.rs index 41b09746..f36b3506 100644 --- a/crates/engine/src/cmd/insert.rs +++ b/crates/engine/src/cmd/insert.rs @@ -9,8 +9,8 @@ use deckcraft_model::{Chart, ColorRef, Fill, Geom, Line, MediaClip, Shape, Shape use serde_json::{Value, json}; use super::{ - CommandSpec, NO_ID_SPACE, bad, base64_decode, base64_encode, bool_or, bool_param, edit_shapes, format, ok, rect_param, str_param, text, - usize_param, xfrm_of, + CommandSpec, NO_ID_SPACE, always, bad, base64_decode, base64_encode, bool_or, bool_param, cmd, color_value, edit_shapes, has_doc, has_selection, + has_slide, has_text_or_shapes, ok, rect_param, str_param, usize_param, xfrm_of, }; use crate::{EngineError, Result, Session}; diff --git a/crates/engine/src/cmd/inspect.rs b/crates/engine/src/cmd/inspect.rs index c16ad516..8995e6b5 100644 --- a/crates/engine/src/cmd/inspect.rs +++ b/crates/engine/src/cmd/inspect.rs @@ -4,7 +4,7 @@ use deckcraft_model::resolve::{self, Ctx}; use deckcraft_model::{Shape, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, id_param, str_param, usize_param, xfrm_of}; +use super::{CommandSpec, always, bad, cmd, has_doc, id_param, str_param, usize_param, xfrm_of}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/media.rs b/crates/engine/src/cmd/media.rs index 88f542cf..e4ceb9f6 100644 --- a/crates/engine/src/cmd/media.rs +++ b/crates/engine/src/cmd/media.rs @@ -5,7 +5,7 @@ use deckcraft_model::{MediaClip, ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, base64_encode, bool_param, edit_shapes, targets}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_param, cmd, edit_shapes, has_doc, targets}; use crate::{EngineError, MediaStatus, Result, Session, UiRequest}; pub fn specs() -> Vec { @@ -179,7 +179,11 @@ fn gif_play(s: &mut Session, p: &Value) -> Result { #[cfg(test)] mod tests { - use super::*; + use deckcraft_model::ShapeId; + use serde_json::json; + + use crate::cmd::base64_encode; + use crate::{MediaStatus, Session, UiRequest}; fn wav() -> Vec { let rate = 8000u32; diff --git a/crates/engine/src/cmd/merge.rs b/crates/engine/src/cmd/merge.rs index edace42c..7db4a9e3 100644 --- a/crates/engine/src/cmd/merge.rs +++ b/crates/engine/src/cmd/merge.rs @@ -9,7 +9,7 @@ use i_overlay::core::overlay_rule::OverlayRule; use i_overlay::float::single::SingleFloatOverlay; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, base64_encode, str_param, targets, text, xfrm_of}; +use super::{CommandSpec, NO_ID_SPACE, bad, cmd, has_two, str_param, targets, xfrm_of}; use crate::{Result, Session}; /// Closed polygons (slide points) describing a filled area (non-zero winding). @@ -255,7 +255,12 @@ fn merge(s: &mut Session, p: &Value) -> Result { #[cfg(test)] mod tests { - use super::*; + use deckcraft_model::{ShapeId, ShapeKind}; + use serde_json::json; + + use super::{Area, area_of, area_size, letters_of, merge_areas}; + use crate::Session; + use crate::cmd::base64_encode; fn square(x: f64, y: f64, s: f64) -> Area { vec![vec![[x, y], [x + s, y], [x + s, y + s], [x, y + s]]] diff --git a/crates/engine/src/cmd/picture_style.rs b/crates/engine/src/cmd/picture_style.rs index 39f98824..3a757217 100644 --- a/crates/engine/src/cmd/picture_style.rs +++ b/crates/engine/src/cmd/picture_style.rs @@ -6,7 +6,7 @@ use deckcraft_model::style::{Effects, Reflection, Shadow}; use deckcraft_model::{ColorRef, Geom, Line, Shape}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, edit_shapes, str_param}; +use super::{CommandSpec, always, bad, cmd, edit_shapes, has_selection, str_param}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/points.rs b/crates/engine/src/cmd/points.rs index 3ff840db..baa94232 100644 --- a/crates/engine/src/cmd/points.rs +++ b/crates/engine/src/cmd/points.rs @@ -10,7 +10,7 @@ use deckcraft_geom::{PathEl, Point, Xfrm}; use deckcraft_model::{CustomPath, Geom, Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, f64_param, id_param, ok, str_param, xfrm_of}; +use super::{CommandSpec, bad, cmd, f64_param, has_selection, id_param, ok, str_param, xfrm_of}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs index 740085a6..00845c09 100644 --- a/crates/engine/src/cmd/recolor.rs +++ b/crates/engine/src/cmd/recolor.rs @@ -6,7 +6,7 @@ use deckcraft_model::style::{PictureAdjust, PictureMode}; use deckcraft_model::{ColorRef, Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, bool_or, current_shapes, edit_shapes, str_param, targets, text, xfrm_of}; +use super::{CommandSpec, always, bad, bool_or, cmd, current_shapes, edit_shapes, has_selection, str_param, targets, text, xfrm_of}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/reuse.rs b/crates/engine/src/cmd/reuse.rs index 3ec49d99..91cf7c93 100644 --- a/crates/engine/src/cmd/reuse.rs +++ b/crates/engine/src/cmd/reuse.rs @@ -13,7 +13,7 @@ use deckcraft_model::text::{Action, Hyperlink, RunProps, TextBody}; use deckcraft_model::{LayoutId, Master, MasterId, MediaId, Presentation, ShapeId, ShapeKind, Slide, SlideId}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, slide, text, usize_param}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, has_doc, usize_param}; use crate::{Result, Session, media_refs}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/review.rs b/crates/engine/src/cmd/review.rs index e0d59c39..06d39eee 100644 --- a/crates/engine/src/cmd/review.rs +++ b/crates/engine/src/cmd/review.rs @@ -5,7 +5,9 @@ use std::sync::Arc; use deckcraft_model::Comment; use serde_json::{Value, json}; -use super::{CommandSpec, bad, base64_decode, bool_or, bool_param, f64_or, id_param, ok, str_param, text, usize_param}; +use super::{ + CommandSpec, always, bad, base64_decode, bool_or, bool_param, cmd, f64_or, has_doc, has_slide, has_text, id_param, ok, str_param, usize_param, +}; use crate::{Result, Session, Target, UiRequest}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/selection.rs b/crates/engine/src/cmd/selection.rs index e39c98ea..221948c5 100644 --- a/crates/engine/src/cmd/selection.rs +++ b/crates/engine/src/cmd/selection.rs @@ -5,7 +5,7 @@ use deckcraft_model::{Shape, ShapeId}; use serde_json::{Value, json}; -use super::{CommandSpec, bad, bool_or, id_param, ids_param, ok}; +use super::{CommandSpec, bad, bool_or, cmd, has_slide, id_param, ids_param, ok}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/shape.rs b/crates/engine/src/cmd/shape.rs index a84d697f..9ae6ae90 100644 --- a/crates/engine/src/cmd/shape.rs +++ b/crates/engine/src/cmd/shape.rs @@ -9,8 +9,8 @@ use deckcraft_model::{ColorRef, Effects, Fill, Geom, Line, ShapeStyle}; use serde_json::{Value, json}; use super::{ - CommandSpec, NO_ID_SPACE, bad, bool_or, bool_param, color_param, color_value, edit_geometry, edit_shapes, f64_param, format, id_param, ok, - str_param, targets, text, three_d, usize_param, with_param, xfrm_of, + CommandSpec, NO_ID_SPACE, bad, bool_or, bool_param, cmd, color_param, color_value, edit_geometry, edit_shapes, f64_param, has_selection, + has_slide, id_param, ok, str_param, targets, usize_param, with_param, xfrm_of, }; use crate::{Result, Session}; @@ -1522,6 +1522,8 @@ fn ink_to_shape(s: &mut Session, _p: &Value) -> Result { mod tests { #![allow(clippy::unwrap_used)] + use deckcraft_model::ShapeId; + use super::*; use serde_json::json; diff --git a/crates/engine/src/cmd/slide.rs b/crates/engine/src/cmd/slide.rs index f4d1e431..6d5eb4bc 100644 --- a/crates/engine/src/cmd/slide.rs +++ b/crates/engine/src/cmd/slide.rs @@ -6,7 +6,7 @@ use deckcraft_model::text::TextBody; use deckcraft_model::{LayoutId, LayoutType, Presentation, Section, SlideId, defaults}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, bool_param, ok, opt_usize_param, str_param, text, usize_param}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, bool_param, cmd, has_doc, has_slide, ok, opt_usize_param, str_param, usize_param}; use crate::{Result, Session, Target}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/smartart.rs b/crates/engine/src/cmd/smartart.rs index ba250960..30e38aa6 100644 --- a/crates/engine/src/cmd/smartart.rs +++ b/crates/engine/src/cmd/smartart.rs @@ -14,7 +14,7 @@ use deckcraft_model::{ }; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, current_shapes, shape_of, str_param, targets, text, xfrm_of}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, current_shapes, has_selection, shape_of, str_param, targets, xfrm_of}; use crate::{EngineError, Result, Session}; /// Deepest outline level the Text Pane allows. diff --git a/crates/engine/src/cmd/table.rs b/crates/engine/src/cmd/table.rs index 7e49c4ce..fc98b4a1 100644 --- a/crates/engine/src/cmd/table.rs +++ b/crates/engine/src/cmd/table.rs @@ -5,8 +5,8 @@ use deckcraft_model::{Shape, ShapeKind, Table}; use serde_json::{Value, json}; use super::{ - CommandSpec, bad, bool_or, bool_param, color_param, edit_shapes, f64_param, id_param, ok, str_param, table_drawn_heights, targets, usize_param, - xfrm_of, + CommandSpec, bad, bool_or, bool_param, cmd, color_param, edit_shapes, f64_param, has_selection, has_slide, id_param, ok, str_param, + table_drawn_heights, usize_param, xfrm_of, }; use crate::{DocState, Result, Session}; diff --git a/crates/engine/src/cmd/text.rs b/crates/engine/src/cmd/text.rs index 48e4c5c1..fc4c81d5 100644 --- a/crates/engine/src/cmd/text.rs +++ b/crates/engine/src/cmd/text.rs @@ -10,7 +10,8 @@ use deckcraft_model::{Presentation, Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; use super::{ - CommandSpec, NO_TEXT_POINT, SELECT_TEXT_OR_SHAPE, bad, bool_or, cmd, edit_shapes, format, id_param, ok, shape_of, str_param, text, xfrm_of, + CommandSpec, NO_TEXT_POINT, SELECT_TEXT_OR_SHAPE, always, bad, bool_or, cmd, edit_shapes, has_doc, has_slide, has_text, id_param, ok, shape_of, + str_param, xfrm_of, }; use crate::{DocState, HistoryEntry, Result, Selection, Session, Target, TextSel, push_undo}; diff --git a/crates/engine/src/cmd/transition.rs b/crates/engine/src/cmd/transition.rs index a2713e0b..bcf1326a 100644 --- a/crates/engine/src/cmd/transition.rs +++ b/crates/engine/src/cmd/transition.rs @@ -6,7 +6,7 @@ use deckcraft_model::Transition; use deckcraft_model::anim::TRANSITIONS; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_param, ok, str_param, usize_param}; +use super::{CommandSpec, NO_ID_SPACE, always, bad, bool_param, cmd, has_slide, ok, str_param, usize_param}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/cmd/zoom.rs b/crates/engine/src/cmd/zoom.rs index e6350f53..4b27e3be 100644 --- a/crates/engine/src/cmd/zoom.rs +++ b/crates/engine/src/cmd/zoom.rs @@ -13,7 +13,7 @@ use deckcraft_model::text::{Action, Hyperlink, TextBody}; use deckcraft_model::{LayoutType, Shape, ShapeId, ShapeKind, SlideId, defaults}; use serde_json::{Value, json}; -use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, str_param}; +use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, has_slide, str_param}; use crate::{Result, Session}; pub fn specs() -> Vec { diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 7cf7a558..38ae7d82 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -1,8 +1,10 @@ use serde_json::json; +use crate::tools::{Mods, PointerEvent, PointerKind}; use crate::{ DocState, History, Presentation, Session, Target, TextSel, ToolKind, Value, cmd, command_specs, connect, find_command, model, sample, tools, }; +use deckcraft_model::ShapeId; fn session() -> Session { Session::with_new() diff --git a/crates/format/src/chart_parts_tests.rs b/crates/format/src/chart_parts_tests.rs index 45bb6459..df74a183 100644 --- a/crates/format/src/chart_parts_tests.rs +++ b/crates/format/src/chart_parts_tests.rs @@ -1,6 +1,9 @@ -use super::Presentation; +use std::io::{Cursor, Write}; +use std::sync::Arc; + +use super::{Budget, Presentation, load, load_checked, load_within, read_entry, read_entry_max, save}; use deckcraft_model::chart::{Chart, ChartPart, ChartRel, ChartType}; -use deckcraft_model::{Master, Shape, ShapeId}; +use deckcraft_model::{Master, Shape, ShapeId, ShapeKind}; use serde_json::{Value, json}; const PART: &str = "ppt/embeddings/owned.xlsx"; diff --git a/crates/model/src/tests.rs b/crates/model/src/tests.rs index 69d355cc..fc241674 100644 --- a/crates/model/src/tests.rs +++ b/crates/model/src/tests.rs @@ -1,6 +1,7 @@ use super::{ - Cell, Fill, LayoutType, PhType, Presentation, Run, SchemeSlot, Shape, ShapeKind, ShapeStyle, Slide, TextBody, Theme, Xfrm, defaults, resolve, - style, text, theme, walk, + ColorRef, Fill, LayoutType, Paragraph, PhType, Placeholder, Presentation, Run, RunProps, SchemeSlot, Shape, ShapeId, ShapeKind, ShapeStyle, + Slide, Table, TextBody, Theme, Xfrm, defaults, ink_pressure_is_legacy, ink_sample_width, parent_of, resolve, sibling_list_mut, style, text, + theme, walk, }; use crate::resolve::Ctx; diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs index bd59f9d9..d58d232b 100644 --- a/crates/pdf/src/tests.rs +++ b/crates/pdf/src/tests.rs @@ -1,6 +1,15 @@ use std::sync::Arc; -use super::{Font, PageLayout, PdfError, PdfOptions, Presentation, export, handout_boxes, raster_scale}; +use std::collections::HashMap; + +use deckcraft_fonts::FontDb; +use deckcraft_render::RenderOpts; +use kurbo::Rect; + +use super::{ + MAX_RASTER_PIXELS, PAPERS, PageLayout, PdfError, PdfOptions, Presentation, export, glyph_text_ranges, handout_boxes, master_text_pieces, + master_texts, notes_frames, notes_slide_box, paper_size, raster_scale, +}; use deckcraft_model::text::TextBody; fn deck(n: usize) -> Presentation { diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs index b0f67cef..7510e407 100644 --- a/crates/render/src/tests.rs +++ b/crates/render/src/tests.rs @@ -1,6 +1,7 @@ use super::{ - Ctx, Fill, Image, Opts, PathMorph, Point, Rect, RenderOpts, Renderer, SlideFields, TextMorph, crop_dest, dpi_for_scale, gif_frame, image_dpi, - images, morph_path, morph_text, parse_path, place_slide, render_blend, render_shapes, render_slide, text_transform, + Ctx, Fields, Fill, Image, Opts, PathMorph, Point, RENDERER, Rect, Region, RenderOpts, Renderer, Rgba, SlideFields, TextMorph, crop_dest, + dpi_for_scale, gif_frame, image_dpi, images, morph_path, morph_text, needs_filters, parse_path, pasteboard_region, place_slide, render_blend, + render_shapes, render_slide, render_slide_drawn, slide_extent, text_transform, }; use deckcraft_model::chart::{ChartType, Trendline, TrendlineType}; use deckcraft_model::style::ColorRef; diff --git a/crates/render/src/tests_wild.rs b/crates/render/src/tests_wild.rs index 8f548d2a..fec3e9e1 100644 --- a/crates/render/src/tests_wild.rs +++ b/crates/render/src/tests_wild.rs @@ -3,11 +3,12 @@ use super::{ BezPath, Fill, Image, Line, MAX_DASHES, PathEl, Point, Rect, RenderOpts, ShapeKind, dash_with_caps, head_size, images, limit_dash_count, paint, - preset, render_slide, trim_ends, + render_slide, trim_ends, }; use deckcraft_color::Rgba; use deckcraft_model::style::ColorRef; use deckcraft_model::{CustomPath, Geom, Presentation, Shape, ShapeId, Xfrm}; +use kurbo::Shape as _; fn deck_with(shapes: Vec) -> Presentation { let mut p = Presentation::default(); diff --git a/crates/ui-egui/src/backstage_tests.rs b/crates/ui-egui/src/backstage_tests.rs index 9a6048e4..78330b1b 100644 --- a/crates/ui-egui/src/backstage_tests.rs +++ b/crates/ui-egui/src/backstage_tests.rs @@ -12,7 +12,7 @@ use egui_kittest::Harness; use egui_kittest::kittest::Queryable; use serde_json::json; -use super::theme; +use crate::backstage::{Backstage, NAV_W, Nav, Page, PrintScope, entries, format_bytes, print_page_size, print_params, print_slides, split_path}; use crate::{Services, SlideApp}; fn harness(app: SlideApp) -> Harness<'static, SlideApp> {