clippy

Author: wash2

accessibility/src/id.rs

@@ -124,12 +124,12 @@ impl From<Id> for u64 {
     }
 }
 
-impl ToString for Id {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for Id {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.0 {
-            Internal::Unique(_) => "Undefined".to_string(),
-            Internal::Custom(_, id) => id.to_string(),
-            Internal::Set(_) => "Set".to_string(),
+            Internal::Unique(_) => write!(f, "Undefined"),
+            Internal::Custom(_, id) => write!(f, "{}", id.to_string()),
+            Internal::Set(_) => write!(f, "Set"),
         }
     }
 }

core/src/clipboard.rs

@@ -20,7 +20,7 @@ pub trait Clipboard {
     /// Reads the current content of the [`Clipboard`] as text.
     fn read_data(
         &self,
-        kind: Kind,
+        _kind: Kind,
         _mimes: Vec<String>,
     ) -> Option<(Vec<u8>, String)> {
         None
@@ -29,7 +29,7 @@ pub trait Clipboard {
     /// Writes the given contents to the [`Clipboard`].
     fn write_data(
         &mut self,
-        kind: Kind,
+        _kind: Kind,
         _contents: ClipboardStoreData<
             Box<dyn Send + Sync + 'static + mime::AsMimeTypes>,
         >,
@@ -70,7 +70,7 @@ pub trait Clipboard {
     }
 
     /// Request window size
-    fn request_logical_window_size(&self, width: f32, height: f32) {}
+    fn request_logical_window_size(&self, _width: f32, _height: f32) {}
 }
 
 /// The kind of [`Clipboard`].
@@ -141,10 +141,7 @@ pub fn peek_dnd<T: AllowedMimeTypes>(
     clipboard: &mut dyn Clipboard,
     mime: Option<String>,
 ) -> Option<T> {
-    let Some(mime) = mime.or_else(|| T::allowed().first().cloned().into())
-    else {
-        return None;
-    };
+    let mime = mime.or_else(|| T::allowed().first().cloned())?;
     clipboard
         .peek_dnd(mime)
         .and_then(|data| T::try_from(data).ok())
@@ -160,7 +157,7 @@ pub enum DndSource {
 }
 
 /// A list of DnD destination rectangles.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct DndDestinationRectangles {
     /// The rectangle of the DnD destination.
     rectangles: Vec<DndDestinationRectangle>,
@@ -169,9 +166,7 @@ pub struct DndDestinationRectangles {
 impl DndDestinationRectangles {
     /// Creates a new [`DndDestinationRectangles`].
     pub fn new() -> Self {
-        Self {
-            rectangles: Vec::new(),
-        }
+        Self::default()
     }
 
     /// Creates a new [`DndDestinationRectangles`] with the given capacity.

core/src/element.rs

@@ -311,7 +311,7 @@ where
     }
 
     fn diff(&mut self, tree: &mut Tree) {
-        self.widget.diff(tree)
+        self.widget.diff(tree);
     }
 
     fn size(&self) -> Size<Length> {

core/src/id.rs

@@ -60,12 +60,12 @@ impl From<Id> for NonZeroU128 {
     }
 }
 
-impl ToString for Id {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for Id {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.0 {
-            Internal::Unique(_) => "Undefined".to_string(),
-            Internal::Custom(_, id) => id.to_string(),
-            Internal::Set(_) => "Set".to_string(),
+            Internal::Unique(_) => write!(f, "Undefined"),
+            Internal::Custom(_, id) => write!(f, "{}", id.to_string()),
+            Internal::Set(_) => write!(f, "Set"),
         }
     }
 }

core/src/overlay/group.rs

@@ -4,7 +4,6 @@ use crate::mouse;
 use crate::overlay;
 use crate::renderer;
 use crate::widget;
-use crate::widget::Operation;
 use crate::{Clipboard, Event, Layout, Overlay, Point, Rectangle, Shell, Size};
 
 /// An [`Overlay`] container that displays multiple overlay [`overlay::Element`]

core/src/renderer/null.rs

@@ -1,5 +1,5 @@
 use crate::alignment;
-use crate::image::{self, Image};
+use crate::image;
 use crate::renderer::{self, Renderer};
 use crate::svg;
 use crate::text::{self, Text};

core/src/theme.rs

@@ -160,6 +160,7 @@ impl Theme {
     }
 }
 
+#[allow(clippy::derivable_impls)]
 impl Default for Theme {
     fn default() -> Self {
         #[cfg(feature = "auto-detect-theme")]

core/src/widget/text.rs

@@ -32,8 +32,6 @@ use crate::{
     Widget,
 };
 
-use std::borrow::Cow;
-
 pub use text::{LineHeight, Shaping, Wrapping};
 
 /// A bunch of text.
@@ -313,7 +311,7 @@ where
     }
 
     fn set_id(&mut self, id: crate::widget::Id) {
-        self.id = id
+        self.id = id;
     }
 }
 

core/src/widget/tree.rs

@@ -269,13 +269,13 @@ impl Tree {
             new_children.iter().map(|c| c.borrow().id()).collect(),
             |tree, widget| {
                 let borrowed: &mut dyn Widget<_, _, _> = widget.borrow_mut();
-                tree.diff(borrowed)
+                tree.diff(borrowed);
             },
             |widget| {
                 let borrowed: &dyn Widget<_, _, _> = widget.borrow();
                 Self::new(borrowed)
             },
-        )
+        );
     }
 
     /// Reconciles the children of the tree with the provided list of widgets using custom

graphics/src/image.rs

@@ -4,8 +4,6 @@ pub use ::image as image_rs;
 
 use crate::core::image;
 use crate::core::svg;
-use crate::core::Color;
-use crate::core::Radians;
 use crate::core::Rectangle;
 
 /// A raster or vector image.