Remove span generics

Author: cart

crates/bevy_text/src/text.rs

@@ -1,3 +1,9 @@
+pub use cosmic_text::{
+    self, FamilyOwned as FontFamily, Stretch as FontStretch, Style as FontStyle,
+    Weight as FontWeight,
+};
+
+use crate::{Font, TextLayoutInfo, TextSpanAccess, TextSpanComponent};
 use bevy_asset::Handle;
 use bevy_color::Color;
 use bevy_derive::{Deref, DerefMut};
@@ -9,12 +15,6 @@ use cosmic_text::{Buffer, Metrics};
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 
-use crate::{Font, TextLayoutInfo, TextSpanAccess, TextSpanComponent};
-pub use cosmic_text::{
-    self, FamilyOwned as FontFamily, Stretch as FontStretch, Style as FontStyle,
-    Weight as FontWeight,
-};
-
 /// Wrapper for [`cosmic_text::Buffer`]
 #[derive(Deref, DerefMut, Debug, Clone)]
 pub struct CosmicBuffer(pub Buffer);

crates/bevy_text/src/text2d.rs

@@ -1,8 +1,8 @@
 use crate::pipeline::CosmicFontSystem;
 use crate::{
     ComputedTextBlock, Font, FontAtlasSets, LineBreak, PositionedGlyph, SwashCache, TextBlock,
-    TextBounds, TextError, TextLayoutInfo, TextPipeline, TextReader, TextRoot, TextSpan,
-    TextSpanAccess, TextStyle, TextWriter, YAxisOrientation,
+    TextBounds, TextError, TextLayoutInfo, TextPipeline, TextReader, TextRoot, TextSpanAccess,
+    TextStyle, TextWriter, YAxisOrientation,
 };
 use bevy_asset::Assets;
 use bevy_color::LinearRgba;
@@ -95,9 +95,7 @@ impl Text2d {
     }
 }
 
-impl TextRoot for Text2d {
-    type Span = TextSpan;
-}
+impl TextRoot for Text2d {}
 
 impl TextSpanAccess for Text2d {
     fn read_span(&self) -> &str {

crates/bevy_text/src/text_access.rs

@@ -4,7 +4,7 @@ use bevy_ecs::{
 };
 use bevy_hierarchy::Children;
 
-use crate::TextStyle;
+use crate::{TextSpan, TextStyle};
 
 /// Helper trait for using the [`TextReader`] and [`TextWriter`] system params.
 pub trait TextSpanAccess: Component {
@@ -15,10 +15,7 @@ pub trait TextSpanAccess: Component {
 }
 
 /// Helper trait for the root text component in a text block.
-pub trait TextRoot: TextSpanAccess + From<String> {
-    /// Component type for spans of text blocks starting with the root component.
-    type Span: TextSpanComponent;
-}
+pub trait TextRoot: TextSpanAccess + From<String> {}
 
 /// Helper trait for the text span components in a text block.
 pub trait TextSpanComponent: TextSpanAccess + From<String> {}
@@ -56,7 +53,7 @@ pub struct TextReader<'w, 's, R: TextRoot> {
         'w,
         's,
         (
-            &'static <R as TextRoot>::Span,
+            &'static TextSpan,
             &'static TextStyle,
             Option<&'static Children>,
         ),
@@ -126,7 +123,7 @@ pub struct TextSpanIter<'a, R: TextRoot> {
         'a,
         'a,
         (
-            &'static <R as TextRoot>::Span,
+            &'static TextSpan,
             &'static TextStyle,
             Option<&'static Children>,
         ),
@@ -195,8 +192,8 @@ impl<'a, R: TextRoot> Drop for TextSpanIter<'a, R> {
 #[derive(SystemParam)]
 pub struct TextWriter<'w, 's, R: TextRoot> {
     scratch: ResMut<'w, TextIterScratch>,
-    roots: Query<'w, 's, (&'static mut R, &'static mut TextStyle), Without<<R as TextRoot>::Span>>,
-    spans: Query<'w, 's, (&'static mut <R as TextRoot>::Span, &'static mut TextStyle), Without<R>>,
+    roots: Query<'w, 's, (&'static mut R, &'static mut TextStyle), Without<TextSpan>>,
+    spans: Query<'w, 's, (&'static mut TextSpan, &'static mut TextStyle), Without<R>>,
     children: Query<'w, 's, &'static Children>,
 }
 

crates/bevy_ui/src/widget/text.rs

@@ -20,7 +20,7 @@ use bevy_sprite::TextureAtlasLayout;
 use bevy_text::{
     scale_value, ComputedTextBlock, CosmicFontSystem, Font, FontAtlasSets, LineBreak, SwashCache,
     TextBlock, TextBounds, TextError, TextLayoutInfo, TextMeasureInfo, TextPipeline, TextReader,
-    TextRoot, TextSpan, TextSpanAccess, TextStyle, TextWriter, YAxisOrientation,
+    TextRoot, TextSpanAccess, TextStyle, TextWriter, YAxisOrientation,
 };
 use bevy_transform::components::Transform;
 use bevy_utils::{tracing::error, Entry};
@@ -116,9 +116,7 @@ impl Text {
     }
 }
 
-impl TextRoot for Text {
-    type Span = TextSpan;
-}
+impl TextRoot for Text {}
 
 impl TextSpanAccess for Text {
     fn read_span(&self) -> &str {