clippy fixes

Author: UkoeHB

crates/bevy_text/src/pipeline.rs

@@ -220,7 +220,7 @@ impl TextPipeline {
         computed.needs_rerender = false;
 
         // Extract font ids from the iterator while traversing it.
-        let mut glyph_info = std::mem::take(&mut self.glyph_info);
+        let mut glyph_info = core::mem::take(&mut self.glyph_info);
         glyph_info.clear();
         let text_spans = text_spans.inspect(|(_, _, _, style)| {
             glyph_info.push((style.font.id(), style.font_smoothing));

crates/bevy_text/src/text.rs

@@ -394,7 +394,7 @@ pub fn detect_text_needs_rerender<Root: Component>(
     for root in changed_roots.iter() {
         let Ok((_, Some(mut computed), _)) = computed.get_mut(root) else {
             warn_once!("found entity {:?} with a root text component ({}) but no ComputedTextBlock; this warning only \
-                prints once", root, std::any::type_name::<Root>());
+                prints once", root, core::any::type_name::<Root>());
             continue;
         };
         computed.needs_rerender = true;
@@ -408,15 +408,15 @@ pub fn detect_text_needs_rerender<Root: Component>(
         if has_text_block {
             warn_once!("found entity {:?} with a TextSpan that has a TextBlock, which should only be on root \
                 text entities (that have {}); this warning only prints once",
-                entity, std::any::type_name::<Root>());
+                entity, core::any::type_name::<Root>());
         }
 
         let Some(span_parent) = maybe_span_parent else {
             warn_once!(
                 "found entity {:?} with a TextSpan that has no parent; it should have an ancestor \
                 with a root text component ({}); this warning only prints once",
                 entity,
-                std::any::type_name::<Root>()
+                core::any::type_name::<Root>()
             );
             continue;
         };
@@ -447,7 +447,7 @@ pub fn detect_text_needs_rerender<Root: Component>(
                     "found entity {:?} with a TextSpan that has no ancestor with the root text \
                     component ({}); this warning only prints once",
                     entity,
-                    std::any::type_name::<Root>()
+                    core::any::type_name::<Root>()
                 );
                 break;
             };

crates/bevy_text/src/text_access.rs

@@ -26,7 +26,7 @@ pub(crate) struct TextIterScratch {
 }
 
 impl TextIterScratch {
-    fn take<'a, 'b>(&'a mut self) -> Vec<(&'b Children, usize)> {
+    fn take<'a>(&mut self) -> Vec<(&'a Children, usize)> {
         core::mem::take(&mut self.stack)
             .into_iter()
             .map(|_| -> (&Children, usize) { unreachable!() })
@@ -62,7 +62,7 @@ pub struct TextReader<'w, 's, R: TextRoot> {
 
 impl<'w, 's, R: TextRoot> TextReader<'w, 's, R> {
     /// Returns an iterator over text spans in a text block, starting with the root entity.
-    pub fn iter<'a>(&'a mut self, root_entity: Entity) -> TextSpanIter<'a, R> {
+    pub fn iter(&mut self, root_entity: Entity) -> TextSpanIter<R> {
         let stack = self.scratch.take();
 
         TextSpanIter {
@@ -141,16 +141,13 @@ impl<'a, R: TextRoot> Iterator for TextSpanIter<'a, R> {
                     self.stack.push((children, 0));
                 }
                 return Some((root_entity, 0, text.read_span(), style));
-            } else {
-                return None;
             }
+            return None;
         }
 
         // Span
         loop {
-            let Some((children, idx)) = self.stack.last_mut() else {
-                return None;
-            };
+            let (children, idx) = self.stack.last_mut()?;
 
             loop {
                 let Some(child) = children.get(*idx) else {
@@ -181,7 +178,7 @@ impl<'a, R: TextRoot> Iterator for TextSpanIter<'a, R> {
 impl<'a, R: TextRoot> Drop for TextSpanIter<'a, R> {
     fn drop(&mut self) {
         // Return the internal stack.
-        let stack = std::mem::take(&mut self.stack);
+        let stack = core::mem::take(&mut self.stack);
         self.scratch.recover(stack);
     }
 }

crates/bevy_ui/src/accessibility.rs

@@ -28,7 +28,7 @@ fn calc_name(
             .iter(child)
             .map(|(_, _, text, _)| text.into())
             .collect::<Vec<String>>();
-        if values.len() > 0 {
+        if !values.is_empty() {
             name = Some(values.join(" "));
         }
     }