Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

refactor(doc): make live shape imports explicit

Dylan M. Taylor010979864a76
diff --git a/crates/doc/src/live/blend_spec.rs b/crates/doc/src/live/blend_spec.rs
index 79c129030..75df5eee1 100644
--- a/crates/doc/src/live/blend_spec.rs
+++ b/crates/doc/src/live/blend_spec.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{Deserialize, PathData, Serialize};
// =====================================================================================
// Data
diff --git a/crates/doc/src/live/envelope.rs b/crates/doc/src/live/envelope.rs
index 13d30cef0..6604c86d1 100644
--- a/crates/doc/src/live/envelope.rs
+++ b/crates/doc/src/live/envelope.rs
@@ -1,6 +1,6 @@
use super::expand::{Hooks, Outliner, Warper, map_node};
use super::mesh::{GradientMesh, MeshPoint, grid_len, grid_points, nodes_bounds, surface_of};
-use super::*;
+use super::{Affine, Arc, Color, Deserialize, Node, NodeId, NodeKind, PathData, Point, Rect, Serialize, Vec2, yes};
/// How an envelope distorts its content.
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/crates/doc/src/live/expand.rs b/crates/doc/src/live/expand.rs
index 09eada113..61b0b91a9 100644
--- a/crates/doc/src/live/expand.rs
+++ b/crates/doc/src/live/expand.rs
@@ -1,7 +1,10 @@
use super::envelope::{EnvelopeOptions, expand_envelope};
use super::mesh::GradientMesh;
use super::warp::map_nonlinear;
-use super::*;
+use super::{
+ Affine, Appearance, AppearanceItem, Arc, FillLayer, ImageObject, Node, NodeId, NodeKind, Paint, PathData, Point, Rect, SubPath, Vec2,
+ blend_expand,
+};
/// Optional hook that converts nodes the pure evaluation can't map (text) to outlines.
pub type Outliner<'a> = Option<&'a dyn Fn(&Node) -> Option<Node>>;
diff --git a/crates/doc/src/live/mesh.rs b/crates/doc/src/live/mesh.rs
index 2cbe7602c..783e32556 100644
--- a/crates/doc/src/live/mesh.rs
+++ b/crates/doc/src/live/mesh.rs
@@ -1,6 +1,9 @@
use super::envelope::{EnvelopeKind, H_DOWN, H_LEFT, H_RIGHT, H_UP, envelope_grid, mesh_at};
use super::warp::{WarpStyle, flatten_subpath, resample, warp_point};
-use super::*;
+use super::{
+ Affine, Anchor, Arc, Color, CubicBez, Deserialize, Node, ParamCurve, PathData, Point, Rect, Serialize, Shape, SubPath, Vec2, fifty, lerp_color,
+ one,
+};
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct MeshPoint {
diff --git a/crates/doc/src/live/warp.rs b/crates/doc/src/live/warp.rs
index cacf26ec5..6d7392ac5 100644
--- a/crates/doc/src/live/warp.rs
+++ b/crates/doc/src/live/warp.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{Anchor, BezPath, CubicBez, PI, ParamCurve, PathData, Point, SubPath};
// =====================================================================================
// Warp maps (shared with vectorcraft-effects' Warp effects)
diff --git a/crates/doc/src/node/attributes.rs b/crates/doc/src/node/attributes.rs
index 70653d778..42e41654f 100644
--- a/crates/doc/src/node/attributes.rs
+++ b/crates/doc/src/node/attributes.rs
@@ -1,6 +1,6 @@
use super::kind::NodeKind;
use super::live_shape::LiveShape;
-use super::*;
+use super::{Deserialize, Node, Serialize};
/// Window → Attributes: an object's settings that don't change how it prints.
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
diff --git a/crates/doc/src/node/clip.rs b/crates/doc/src/node/clip.rs
index 959b20a5b..208bdda7f 100644
--- a/crates/doc/src/node/clip.rs
+++ b/crates/doc/src/node/clip.rs
@@ -1,5 +1,5 @@
use super::kind::NodeKind;
-use super::*;
+use super::{BezPath, FillRule, Node, Outliner, Rect, shapes};
/// Unites filled regions (each under its own fill rule) into one path filled non-zero. Booleans
/// live above this crate (`vectorcraft-pathops`), so callers supply it.
diff --git a/crates/doc/src/node/extras.rs b/crates/doc/src/node/extras.rs
index ee1165303..468930348 100644
--- a/crates/doc/src/node/extras.rs
+++ b/crates/doc/src/node/extras.rs
@@ -2,7 +2,7 @@ use super::attributes::ObjectAttributes;
use super::kind::NodeKind;
use super::live_shape::LiveShape;
use super::opacity::OpacityMask;
-use super::*;
+use super::{Node, PathData};
/// The parts of a [`Node`] that few objects have: kept out of line, so that the nodes without
/// them stay small ([`Node::extras`]).
diff --git a/crates/doc/src/node/ids.rs b/crates/doc/src/node/ids.rs
index ea4b1b484..9e09a47a9 100644
--- a/crates/doc/src/node/ids.rs
+++ b/crates/doc/src/node/ids.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{Deserialize, Serialize};
/// Stable per-document object id. Never reused.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
diff --git a/crates/doc/src/node/kind.rs b/crates/doc/src/node/kind.rs
index 5bebc4379..0994cf390 100644
--- a/crates/doc/src/node/kind.rs
+++ b/crates/doc/src/node/kind.rs
@@ -1,6 +1,6 @@
use super::ids::LayerColor;
use super::live_shape::LiveShape;
-use super::*;
+use super::{Affine, Arc, BlendSpec, Deserialize, EnvelopeKind, FillRule, GradientMesh, Node, PathData, RepeatSpec, Serialize, TextObject, yes};
/// Embedded or linked raster image.
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/crates/doc/src/node/live_shape.rs b/crates/doc/src/node/live_shape.rs
index 65dad904e..93f2022e0 100644
--- a/crates/doc/src/node/live_shape.rs
+++ b/crates/doc/src/node/live_shape.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{Affine, CornerKind, Deserialize, PathData, Point, Rect, Serialize, cut_corners, shapes};
/// Live shape parameters (Illustrator's "Live Shapes"). The node's path is regenerated from these
/// while the shape stays live; editing anchors directly converts it to a plain path.
diff --git a/crates/doc/src/node/opacity.rs b/crates/doc/src/node/opacity.rs
index 0996b8c65..903c84b14 100644
--- a/crates/doc/src/node/opacity.rs
+++ b/crates/doc/src/node/opacity.rs
@@ -1,5 +1,5 @@
use super::kind::NodeKind;
-use super::*;
+use super::{Arc, Color, Deserialize, Node, Paint, Serialize, yes};
/// Opacity mask: the luminance of the mask art sets the object's opacity (white = opaque).
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/crates/doc/src/node/ops.rs b/crates/doc/src/node/ops.rs
index 6cc0cb3be..e02958a8d 100644
--- a/crates/doc/src/node/ops.rs
+++ b/crates/doc/src/node/ops.rs
@@ -3,7 +3,7 @@ use super::ids::{LayerColor, NodeId};
use super::kind::NodeKind;
use super::live_shape::{Scaling, moves_only};
use super::opacity::Knockout;
-use super::*;
+use super::{Affine, Appearance, Arc, BlendMode, EnvelopeKind, FillRule, Node, PathData, Point, Rect, RepeatSpec, SYMBOL_SQUARE, Shape, SymbolBoxes};
impl Node {
pub fn new(id: NodeId, kind: NodeKind) -> Self {
diff --git a/crates/doc/src/node/wire.rs b/crates/doc/src/node/wire.rs
index 43fcfea92..0af451316 100644
--- a/crates/doc/src/node/wire.rs
+++ b/crates/doc/src/node/wire.rs
@@ -3,7 +3,7 @@ use super::extras::{Extras, NO_EXTRAS, NodeExtras};
use super::ids::NodeId;
use super::kind::NodeKind;
use super::opacity::{Knockout, OpacityMask};
-use super::*;
+use super::{Appearance, BlendMode, Deserialize, Node, PathData, Serialize, one, yes};
/// How a [`Node`] is written: the flat field list of the file format, in its order, borrowed from
/// the node and its extras (nothing is copied). The node reads back through `NodeWire`.