lints and lingering example migrations

bevyengine · Oct 9, 2024 · e95bcf4 · e95bcf4
1 parent 5b7bb0b
commit e95bcf4
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 63 deletions.
diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
@@ -109,11 +109,6 @@ impl Text {
     pub fn new(text: impl Into<String>) -> Self {
         Self(text.into())
     }
-
-    /// Makes an empty UI text component.
-    pub fn empty() -> Self {
-        Self::new("")
-    }
 }
 
 impl TextRoot for Text {}

diff --git a/examples/3d/anisotropy.rs b/examples/3d/anisotropy.rs
@@ -81,18 +81,15 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>, app_status: Res
 
 /// Spawns the help text.
 fn spawn_text(commands: &mut Commands, app_status: &AppStatus) {
-    commands.spawn(
-        TextBundle {
-            text: app_status.create_help_text(),
-            ..default()
-        }
-        .with_style(Style {
+    commands.spawn((
+        app_status.create_help_text(),
+        Style {
             position_type: PositionType::Absolute,
             bottom: Val::Px(12.0),
             left: Val::Px(12.0),
             ..default()
-        }),
-    );
+        },
+    ));
 }
 
 /// For each material, creates a version with the anisotropy removed.
@@ -287,10 +284,10 @@ impl AppStatus {
         };
 
         // Build the `Text` object.
-        Text::from_section(
-            format!("{}\n{}", material_variant_help_text, light_help_text),
-            TextStyle::default(),
-        )
+        Text(format!(
+            "{}\n{}",
+            material_variant_help_text, light_help_text
+        ))
     }
 }
 

diff --git a/examples/3d/clearcoat.rs b/examples/3d/clearcoat.rs
@@ -217,18 +217,15 @@ fn spawn_camera(commands: &mut Commands, asset_server: &AssetServer) {
 
 /// Spawns the help text.
 fn spawn_text(commands: &mut Commands, light_mode: &LightMode) {
-    commands.spawn(
-        TextBundle {
-            text: light_mode.create_help_text(),
-            ..default()
-        }
-        .with_style(Style {
+    commands.spawn((
+        light_mode.create_help_text(),
+        Style {
             position_type: PositionType::Absolute,
             bottom: Val::Px(12.0),
             left: Val::Px(12.0),
             ..default()
-        }),
-    );
+        },
+    ));
 }
 
 /// Moves the light around.
@@ -320,6 +317,6 @@ impl LightMode {
             LightMode::Directional => "Press Space to switch to a point light",
         };
 
-        Text::from_section(help_text, TextStyle::default())
+        Text::new(help_text)
     }
 }
diff --git a/examples/state/computed_states.rs b/examples/state/computed_states.rs
@@ -368,8 +368,8 @@ mod ui {
                         MenuButton::Play,
                     ))
                     .with_children(|parent| {
-                        parent.spawn(TextBundle::from_section(
-                            "Play",
+                        parent.spawn((
+                            Text::new("Play"),
                             TextStyle {
                                 font_size: 33.0,
                                 color: Color::srgb(0.9, 0.9, 0.9),
@@ -400,8 +400,8 @@ mod ui {
                         MenuButton::Tutorial,
                     ))
                     .with_children(|parent| {
-                        parent.spawn(TextBundle::from_section(
-                            "Tutorial",
+                        parent.spawn((
+                            Text::new("Tutorial"),
                             TextStyle {
                                 font_size: 33.0,
                                 color: Color::srgb(0.9, 0.9, 0.9),
@@ -501,8 +501,8 @@ mod ui {
                         MenuButton::Play,
                     ))
                     .with_children(|parent| {
-                        parent.spawn(TextBundle::from_section(
-                            "Paused",
+                        parent.spawn((
+                            Text::new("Paused"),
                             TextStyle {
                                 font_size: 33.0,
                                 color: Color::srgb(0.9, 0.9, 0.9),
@@ -533,8 +533,8 @@ mod ui {
                 },
             ))
             .with_children(|parent| {
-                parent.spawn(TextBundle::from_section(
-                    "TURBO MODE",
+                parent.spawn((
+                    Text::new("TURBO MODE"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.9, 0.3, 0.1),
@@ -575,34 +575,34 @@ mod ui {
                 },
             ))
             .with_children(|parent| {
-                parent.spawn(TextBundle::from_section(
-                    "Move the bevy logo with the arrow keys",
+                parent.spawn((
+                    Text::new("Move the bevy logo with the arrow keys"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),
                         ..default()
                     },
                 ));
-                parent.spawn(TextBundle::from_section(
-                    "Press T to enter TURBO MODE",
+                parent.spawn((
+                    Text::new("Press T to enter TURBO MODE"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),
                         ..default()
                     },
                 ));
 
-                parent.spawn(TextBundle::from_section(
-                    "Press SPACE to pause",
+                parent.spawn((
+                    Text::new("Press SPACE to pause"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),
                         ..default()
                     },
                 ));
 
-                parent.spawn(TextBundle::from_section(
-                    "Press ESCAPE to return to the menu",
+                parent.spawn((
+                    Text::new("Press ESCAPE to return to the menu"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),
@@ -632,17 +632,17 @@ mod ui {
                 },
             ))
             .with_children(|parent| {
-                parent.spawn(TextBundle::from_section(
-                    "Press SPACE to resume",
+                parent.spawn((
+                    Text::new("Press SPACE to resume"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),
                         ..default()
                     },
                 ));
 
-                parent.spawn(TextBundle::from_section(
-                    "Press ESCAPE to return to the menu",
+                parent.spawn((
+                    Text::new("Press ESCAPE to return to the menu"),
                     TextStyle {
                         font_size: 33.0,
                         color: Color::srgb(0.3, 0.3, 0.7),

diff --git a/examples/state/custom_transitions.rs b/examples/state/custom_transitions.rs
@@ -273,8 +273,8 @@ fn setup_menu(mut commands: Commands) {
                     ..default()
                 })
                 .with_children(|parent| {
-                    parent.spawn(TextBundle::from_section(
-                        "Play",
+                    parent.spawn((
+                        Text::new("Play"),
                         TextStyle {
                             font_size: 33.0,
                             color: Color::srgb(0.9, 0.9, 0.9),

diff --git a/examples/state/states.rs b/examples/state/states.rs
@@ -78,8 +78,8 @@ fn setup_menu(mut commands: Commands) {
                     ..default()
                 })
                 .with_children(|parent| {
-                    parent.spawn(TextBundle::from_section(
-                        "Play",
+                    parent.spawn((
+                        Text::new("Play"),
                         TextStyle {
                             font_size: 33.0,
                             color: Color::srgb(0.9, 0.9, 0.9),

diff --git a/examples/state/sub_states.rs b/examples/state/sub_states.rs
@@ -183,8 +183,8 @@ mod ui {
                         ..default()
                     })
                     .with_children(|parent| {
-                        parent.spawn(TextBundle::from_section(
-                            "Play",
+                        parent.spawn((
+                            Text::new("Play"),
                             TextStyle {
                                 font_size: 33.0,
                                 color: Color::srgb(0.9, 0.9, 0.9),
@@ -238,8 +238,8 @@ mod ui {
                         ..default()
                     })
                     .with_children(|parent| {
-                        parent.spawn(TextBundle::from_section(
-                            "Paused",
+                        parent.spawn((
+                            Text::new("Paused"),
                             TextStyle {
                                 font_size: 33.0,
                                 color: Color::srgb(0.9, 0.9, 0.9),

diff --git a/examples/stress_tests/many_glyphs.rs b/examples/stress_tests/many_glyphs.rs
@@ -53,7 +53,6 @@ fn setup(mut commands: Commands) {
     let text_block = TextBlock {
         justify: JustifyText::Left,
         linebreak: LineBreak::AnyCharacter,
-        ..Default::default()
     };
 
     commands
@@ -75,11 +74,7 @@ fn setup(mut commands: Commands) {
                     },
                     ..Default::default()
                 })
-                .with_child((
-                    Text(text_string.clone()),
-                    text_style.clone(),
-                    text_block.clone(),
-                ));
+                .with_child((Text(text_string.clone()), text_style.clone(), text_block));
         });
 
     commands.spawn((

diff --git a/examples/stress_tests/text_pipeline.rs b/examples/stress_tests/text_pipeline.rs
@@ -63,15 +63,14 @@ fn spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
         ]
     };
 
-    let spans = (1..50).into_iter().flat_map(|i| make_spans(i).into_iter());
+    let spans = (1..50).flat_map(|i| make_spans(i).into_iter());
 
     commands
         .spawn((
             Text2d::default(),
             TextBlock {
                 justify: JustifyText::Center,
                 linebreak: LineBreak::AnyCharacter,
-                ..Default::default()
             },
             TextBounds::default(),
         ))

diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs
@@ -123,7 +123,7 @@ fn spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
                     Text(message.clone()),
                     text_style.clone(),
                     TextBlock::new(JustifyText::Left, linebreak),
-                    BackgroundColor(Color::srgb(0.8 - j as f32 * 0.2, 0., 0.).into()),
+                    BackgroundColor(Color::srgb(0.8 - j as f32 * 0.2, 0., 0.)),
                 ));
             }
             commands.entity(row_id).add_child(column_id);