Clean up some imports

Author: waywardmonkeys

parley/src/builder.rs

@@ -4,13 +4,14 @@
 //! Context for layout.
 
 use super::context::LayoutContext;
-use super::style::{Brush, StyleProperty, TextStyle, WhiteSpaceCollapse};
+use super::style::WhiteSpaceCollapse;
 use super::FontContext;
 
 use super::layout::Layout;
 
 use alloc::string::String;
 use core::ops::RangeBounds;
+use styled_text::{Brush, StyleProperty, TextStyle};
 
 use crate::inline_box::InlineBox;
 

parley/src/context.rs

@@ -10,9 +10,9 @@ use self::tree::TreeStyleBuilder;
 use super::bidi;
 use super::builder::RangedBuilder;
 use super::resolve::{tree, RangedStyle, RangedStyleBuilder, ResolveContext, ResolvedStyle};
-use super::style::{Brush, TextStyle};
 use super::FontContext;
 
+use styled_text::{Brush, TextStyle};
 use swash::shape::ShapeContext;
 use swash::text::cluster::CharInfo;
 

parley/src/layout/alignment.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::{Alignment, BreakReason, LayoutData};
-use crate::style::Brush;
+use styled_text::Brush;
 
 pub(crate) fn align<B: Brush>(
     layout: &mut LayoutData<B>,

parley/src/layout/data.rs

@@ -3,10 +3,10 @@
 
 use crate::inline_box::InlineBox;
 use crate::layout::{Alignment, Glyph, LineMetrics, RunMetrics, Style};
-use crate::style::Brush;
 use crate::util::nearly_zero;
 use crate::Font;
 use core::ops::Range;
+use styled_text::Brush;
 use swash::shape::Shaper;
 use swash::text::cluster::{Boundary, ClusterInfo};
 use swash::Synthesis;

parley/src/layout/editor.rs

@@ -8,8 +8,8 @@ use crate::{
         cursor::{Cursor, Selection},
         Affinity, Alignment, Layout,
     },
-    style::Brush,
-    FontContext, LayoutContext, Rect, StyleProperty, StyleSet,
+    style::StyleSet,
+    FontContext, LayoutContext, Rect,
 };
 use alloc::{borrow::ToOwned, string::String, vec::Vec};
 use core::{
@@ -18,6 +18,7 @@ use core::{
     fmt::{Debug, Display},
     ops::Range,
 };
+use styled_text::{Brush, StyleProperty};
 
 #[cfg(feature = "accesskit")]
 use crate::layout::LayoutAccessibility;

parley/src/layout/line/greedy.rs

@@ -4,6 +4,8 @@
 //! Greedy line breaking.
 
 use alloc::vec::Vec;
+use core::ops::Range;
+use styled_text::Brush;
 use swash::text::cluster::Whitespace;
 
 #[cfg(feature = "libm")]
@@ -15,9 +17,6 @@ use crate::layout::{
     Alignment, Boundary, BreakReason, Layout, LayoutData, LayoutItem, LayoutItemKind, LineData,
     LineItemData, LineMetrics, Run,
 };
-use crate::style::Brush;
-
-use core::ops::Range;
 
 #[derive(Default)]
 struct LineLayout {

parley/src/layout/mod.rs

@@ -15,7 +15,6 @@ pub mod editor;
 
 use self::alignment::align;
 
-use super::style::Brush;
 use crate::{Font, InlineBox};
 #[cfg(feature = "accesskit")]
 use accesskit::{Node, NodeId, Role, TextDirection, TreeUpdate};
@@ -28,6 +27,7 @@ use data::{
 };
 #[cfg(feature = "accesskit")]
 use hashbrown::{HashMap, HashSet};
+use styled_text::Brush;
 use swash::text::cluster::{Boundary, ClusterInfo};
 use swash::{GlyphId, NormalizedCoord, Synthesis};
 

parley/src/resolve/mod.rs

@@ -10,17 +10,14 @@ pub(crate) use range::RangedStyleBuilder;
 
 use alloc::{vec, vec::Vec};
 
-use super::style::{
-    Brush, FontFamily, FontFeature, FontSettings, FontStack, FontStretch, FontStyle, FontVariation,
-    FontWeight, StyleProperty,
-};
 use crate::font::FontContext;
 use crate::layout;
-use crate::style::TextStyle;
+use crate::style::{FontFeature, FontStretch, FontStyle, FontVariation, FontWeight};
 use crate::util::nearly_eq;
 use core::borrow::Borrow;
 use core::ops::Range;
 use fontique::FamilyId;
+use styled_text::{Brush, FontFamily, FontSettings, FontStack, StyleProperty, TextStyle};
 use swash::text::Language;
 
 /// Style with an associated range.

parley/src/shape.rs

@@ -3,11 +3,12 @@
 
 use super::layout::Layout;
 use super::resolve::{RangedStyle, ResolveContext, Resolved};
-use super::style::{Brush, FontFeature, FontVariation};
+use crate::style::{FontFeature, FontVariation};
 use crate::util::nearly_eq;
 use crate::Font;
 use fontique::QueryFamily;
 use fontique::{self, Query, QueryFont};
+use styled_text::Brush;
 use swash::shape::{partition, Direction, ShapeContext};
 use swash::text::cluster::{CharCluster, CharInfo, Token};
 use swash::text::{Language, Script};