DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Refactor doc for strict Clippy checks
Dylan M. Taylor0104122f061f
diff --git a/crates/doc/src/attrs/char_attrs.rs b/crates/doc/src/attrs/char_attrs.rsindex b81dfbaf8..4f4cb9d52 100644--- a/crates/doc/src/attrs/char_attrs.rs+++ b/crates/doc/src/attrs/char_attrs.rs@@ -1,4 +1,6 @@-use super::*;+use super::{+ Capitalization, ChangeMark, Deserialize, Digits, Kerning, Leading, Position, Serialize, attr_key, deserialize_explicit_value, unknown_attribute,+};attr_set! {/// Character attributes (Character panel / character styles / the character part of paragraph styles).diff --git a/crates/doc/src/attrs/enums.rs b/crates/doc/src/attrs/enums.rsindex 947deb66a..e655c7658 100644--- a/crates/doc/src/attrs/enums.rs+++ b/crates/doc/src/attrs/enums.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Deserialize, Serialize};// ---------- value types ----------diff --git a/crates/doc/src/attrs/para_attrs.rs b/crates/doc/src/attrs/para_attrs.rsindex bf4bb3bbe..17edc8cc1 100644--- a/crates/doc/src/attrs/para_attrs.rs+++ b/crates/doc/src/attrs/para_attrs.rs@@ -1,4 +1,8 @@-use super::*;+use super::{+ Align, BoxBottom, BoxTop, BoxWidth, Composer, Deserialize, GrepStyle, GridAlign, ListAlign, ListCounter, ListType, MAX_TAB_STOPS,+ NestedLineStyle, NestedStyle, NumberStyle, Rule, Serialize, SpanColumns, StartParagraph, TabStop, TextDirection, attr_key,+ deserialize_explicit_value, expand_list_levels, expand_list_text, list_level_index, sanitized_tabs, unknown_attribute,+};attr_set! {/// Paragraph attributes (Paragraph panel / paragraph styles).diff --git a/crates/doc/src/attrs/rules_lists.rs b/crates/doc/src/attrs/rules_lists.rsindex dde764302..f4ef952e4 100644--- a/crates/doc/src/attrs/rules_lists.rs+++ b/crates/doc/src/attrs/rules_lists.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Deserialize, ParaProps, Serialize};/// The colour of a paragraph rule that follows the paragraph's text colour.pub const TEXT_COLOR: &str = "Text Color";diff --git a/crates/doc/src/attrs/tabs.rs b/crates/doc/src/attrs/tabs.rsindex 6962bcc73..b30299bd5 100644--- a/crates/doc/src/attrs/tabs.rs+++ b/crates/doc/src/attrs/tabs.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Deserialize, Serialize};#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]diff --git a/crates/doc/src/item/content.rs b/crates/doc/src/item/content.rsindex 968cd4aca..b81dd266b 100644--- a/crates/doc/src/item/content.rs+++ b/crates/doc/src/item/content.rs@@ -1,6 +1,6 @@use super::graphic::Graphic;use super::text_frame::TextFrame;-use super::*;+use super::{Arc, Deserialize, Item, Serialize};#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]#[serde(rename_all = "camelCase", tag = "type")]diff --git a/crates/doc/src/item/effects.rs b/crates/doc/src/item/effects.rsindex e8e920554..fa416643b 100644--- a/crates/doc/src/item/effects.rs+++ b/crates/doc/src/item/effects.rs@@ -1,4 +1,4 @@-use super::*;+use super::{BlendMode, Deserialize, Serialize, is_default};#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]#[serde(rename_all = "camelCase", default)]diff --git a/crates/doc/src/item/graphic.rs b/crates/doc/src/item/graphic.rsindex 4c02ce949..b0b3b310a 100644--- a/crates/doc/src/item/graphic.rs+++ b/crates/doc/src/item/graphic.rs@@ -1,7 +1,7 @@use super::content::Content;use super::paint::Fill;use super::text_frame::TextWrap;-use super::*;+use super::{Affine, Arc, AssetId, Deserialize, Item, ItemId, PathData, Rect, Serialize};/// Frame fitting options (Object → Fitting → Frame Fitting Options).#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]diff --git a/crates/doc/src/item/paint.rs b/crates/doc/src/item/paint.rsindex 04d8323fc..dfbf5751a 100644--- a/crates/doc/src/item/paint.rs+++ b/crates/doc/src/item/paint.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Deserialize, Point, Rect, Serialize};/// Fill: a swatch reference and tint (InDesign fills always go through swatches or unnamed colours).#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]diff --git a/crates/doc/src/item/text_frame.rs b/crates/doc/src/item/text_frame.rsindex dc501832c..d8f7f29e3 100644--- a/crates/doc/src/item/text_frame.rs+++ b/crates/doc/src/item/text_frame.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Affine, Deserialize, PathData, Rect, Serialize, StoryId, is_default};#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]diff --git a/crates/doc/src/table/cell.rs b/crates/doc/src/table/cell.rsindex 100a3474f..ac022a7a8 100644--- a/crates/doc/src/table/cell.rs+++ b/crates/doc/src/table/cell.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Deserialize, FirstBaseline, ParaFormat, Serialize, Story, StoryId, StrokeType, VerticalJustification};#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]diff --git a/crates/doc/src/table/edit.rs b/crates/doc/src/table/edit.rsindex 589c9666e..8b140fde1 100644--- a/crates/doc/src/table/edit.rs+++ b/crates/doc/src/table/edit.rs@@ -1,5 +1,5 @@+use super::Table;use super::cell::{Cell, Column, RowKind};-use super::*;impl Table {/// Insert `n` rows before row `at` (formatted like the neighbouring row).diff --git a/crates/doc/src/table/grid.rs b/crates/doc/src/table/grid.rsindex 48647cffc..a64f2cd99 100644--- a/crates/doc/src/table/grid.rs+++ b/crates/doc/src/table/grid.rs@@ -1,5 +1,5 @@use super::cell::{Cell, Column, Row, RowKind, TableOptions};-use super::*;+use super::{CharFormat, Deserialize, ParaFormat, Serialize, Story, StoryId, Table};/// A rectangular range of cells (inclusive).#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]diff --git a/crates/doc/src/table/merge.rs b/crates/doc/src/table/merge.rsindex f6eaae3da..7f3faecfe 100644--- a/crates/doc/src/table/merge.rs+++ b/crates/doc/src/table/merge.rs@@ -3,7 +3,7 @@ use super::cell::Row;use super::cell::{RowHeightMode, RowKind};use super::grid::CellRange;use super::story::append_story;-use super::*;+use super::{Story, Table};impl Table {/// The smallest range containing `r` that doesn't cut through a merged region.diff --git a/crates/doc/src/table/story.rs b/crates/doc/src/table/story.rsindex 67573d645..1e69a3738 100644--- a/crates/doc/src/table/story.rs+++ b/crates/doc/src/table/story.rs@@ -1,4 +1,4 @@-use super::*;+use super::{Arc, Story, StoryId, TABLE_ANCHOR, Table};/// Append `other` to `s` as new paragraphs.pub(super) fn append_story(s: &mut Story, other: &Story) {