Address Clippy lints

clippy.toml

@@ -0,0 +1 @@
+too-many-arguments-threshold = 20

futures/src/subscription.rs

@@ -183,11 +183,7 @@ where
 
         let mapper = self.mapper;
 
-        Box::pin(
-            self.recipe
-                .stream(input)
-                .map(move |element| mapper(element)),
-        )
+        Box::pin(self.recipe.stream(input).map(mapper))
     }
 }
 

futures/src/subscription/tracker.rs

@@ -127,7 +127,7 @@ where
             futures.push(Box::pin(future));
         }
 
-        self.subscriptions.retain(|id, _| alive.contains(&id));
+        self.subscriptions.retain(|id, _| alive.contains(id));
 
         futures
     }

glow/src/program.rs

@@ -70,7 +70,7 @@ impl Shader {
         unsafe {
             let shader = gl.create_shader(stage).expect("Cannot create shader");
 
-            gl.shader_source(shader, &content);
+            gl.shader_source(shader, content);
             gl.compile_shader(shader);
 
             if !gl.get_shader_compile_status(shader) {

glow/src/quad/compatibility.rs

@@ -110,10 +110,8 @@ impl Pipeline {
         bounds: Rectangle<u32>,
     ) {
         // TODO: Remove this allocation (probably by changing the shader and removing the need of two `position`)
-        let vertices: Vec<Vertex> = instances
-            .iter()
-            .flat_map(|quad| Vertex::from_quad(quad))
-            .collect();
+        let vertices: Vec<Vertex> =
+            instances.iter().flat_map(Vertex::from_quad).collect();
 
         // TODO: Remove this allocation (or allocate only when needed)
         let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
@@ -187,13 +185,13 @@ impl Pipeline {
                 gl.buffer_sub_data_u8_slice(
                     glow::ARRAY_BUFFER,
                     0,
-                    bytemuck::cast_slice(&vertices),
+                    bytemuck::cast_slice(vertices),
                 );
 
                 gl.buffer_sub_data_u8_slice(
                     glow::ELEMENT_ARRAY_BUFFER,
                     0,
-                    bytemuck::cast_slice(&indices),
+                    bytemuck::cast_slice(indices),
                 );
 
                 gl.draw_elements(

glow/src/quad/core.rs

@@ -154,7 +154,7 @@ impl Pipeline {
                 gl.buffer_sub_data_u8_slice(
                     glow::ARRAY_BUFFER,
                     0,
-                    bytemuck::cast_slice(&instances),
+                    bytemuck::cast_slice(instances),
                 );
 
                 gl.draw_arrays_instanced(

glow/src/text.rs

@@ -54,7 +54,7 @@ impl Pipeline {
         #[cfg(target_arch = "wasm32")]
         let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true);
 
-        let draw_brush = draw_brush_builder.build(&gl);
+        let draw_brush = draw_brush_builder.build(gl);
 
         let measure_brush =
             glyph_brush::GlyphBrushBuilder::using_font(font).build();
@@ -180,7 +180,8 @@ impl Pipeline {
                 }
                 b_count += utf8_len;
             }
-            return byte_index;
+
+            byte_index
         };
 
         if !nearest_only {

graphics/src/layer.rs

@@ -202,15 +202,15 @@ impl<'a> Layer<'a> {
                 Self::process_primitive(
                     layers,
                     translation + *new_translation,
-                    &content,
+                    content,
                     current_layer,
                 );
             }
             Primitive::Cached { cache } => {
                 Self::process_primitive(
                     layers,
                     translation,
-                    &cache,
+                    cache,
                     current_layer,
                 );
             }

graphics/src/widget/canvas/path.rs

@@ -74,7 +74,7 @@ impl Path {
 pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
     Path::new(|builder| {
         let segments_odd = (line_dash.segments.len() % 2 == 1).then(|| {
-            [&line_dash.segments[..], &line_dash.segments[..]].concat()
+            [line_dash.segments, line_dash.segments].concat()
         });
 
         let mut draw_line = false;
@@ -103,8 +103,7 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
                 },
                 index: line_dash.offset,
                 intervals: segments_odd
-                    .as_ref()
-                    .map(Vec::as_slice)
+                    .as_deref()
                     .unwrap_or(line_dash.segments),
             },
         );

graphics/src/widget/canvas/path/builder.rs

@@ -53,7 +53,7 @@ impl Builder {
             let _ = self.raw.line_to(a);
         }
 
-        let _ = self.raw.arc_to(
+        self.raw.arc_to(
             math::Vector::new(radius, radius),
             math::Angle::radians(0.0),
             path::ArcFlags::default(),

graphics/src/widget/qr_code.rs

@@ -67,10 +67,7 @@ where
         let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
             * f32::from(self.cell_size);
 
-        layout::Node::new(Size::new(
-            f32::from(side_length),
-            f32::from(side_length),
-        ))
+        layout::Node::new(Size::new(side_length, side_length))
     }
 
     fn draw(

native/src/hasher.rs

@@ -1,13 +1,7 @@
 /// The hasher used to compare layouts.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Hasher(twox_hash::XxHash64);
 
-impl Default for Hasher {
-    fn default() -> Self {
-        Hasher(twox_hash::XxHash64::default())
-    }
-}
-
 impl core::hash::Hasher for Hasher {
     fn write(&mut self, bytes: &[u8]) {
         self.0.write(bytes)

native/src/overlay/menu.rs

@@ -174,9 +174,9 @@ where
 
         Self {
             container,
-            width: width,
+            width,
             target_height,
-            style: style,
+            style,
         }
     }
 }
@@ -230,7 +230,7 @@ where
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         self.container.on_event(
-            event.clone(),
+            event,
             layout,
             cursor_position,
             renderer,
@@ -326,7 +326,8 @@ where
         use std::f32;
 
         let limits = limits.width(Length::Fill).height(Length::Shrink);
-        let text_size = self.text_size.unwrap_or(renderer.default_size());
+        let text_size =
+            self.text_size.unwrap_or_else(|| renderer.default_size());
 
         let size = {
             let intrinsic = Size::new(
@@ -366,8 +367,9 @@ where
                 let bounds = layout.bounds();
 
                 if bounds.contains(cursor_position) {
-                    let text_size =
-                        self.text_size.unwrap_or(renderer.default_size());
+                    let text_size = self
+                        .text_size
+                        .unwrap_or_else(|| renderer.default_size());
 
                     *self.hovered_option = Some(
                         ((cursor_position.y - bounds.y)
@@ -380,8 +382,9 @@ where
                 let bounds = layout.bounds();
 
                 if bounds.contains(cursor_position) {
-                    let text_size =
-                        self.text_size.unwrap_or(renderer.default_size());
+                    let text_size = self
+                        .text_size
+                        .unwrap_or_else(|| renderer.default_size());
 
                     *self.hovered_option = Some(
                         ((cursor_position.y - bounds.y)
@@ -430,7 +433,8 @@ where
         let appearance = theme.appearance(self.style);
         let bounds = layout.bounds();
 
-        let text_size = self.text_size.unwrap_or(renderer.default_size());
+        let text_size =
+            self.text_size.unwrap_or_else(|| renderer.default_size());
         let option_height = (text_size + self.padding.vertical()) as usize;
 
         let offset = viewport.y - bounds.y;

native/src/program/state.rs

@@ -113,7 +113,7 @@ where
             &mut messages,
         );
 
-        messages.extend(self.queued_messages.drain(..));
+        messages.append(&mut self.queued_messages);
         self.queued_events.clear();
         debug.event_processing_finished();
 

native/src/user_interface.rs

@@ -430,7 +430,7 @@ where
         overlay
             .as_ref()
             .and_then(|layout| {
-                root.overlay(Layout::new(&base), renderer).map(|overlay| {
+                root.overlay(Layout::new(base), renderer).map(|overlay| {
                     let overlay_interaction = overlay.mouse_interaction(
                         Layout::new(layout),
                         cursor_position,

native/src/widget/checkbox.rs

@@ -158,7 +158,10 @@ where
                 Text::new(&self.label)
                     .font(self.font.clone())
                     .width(self.width)
-                    .size(self.text_size.unwrap_or(renderer.default_size())),
+                    .size(
+                        self.text_size
+                            .unwrap_or_else(|| renderer.default_size()),
+                    ),
             )
             .layout(renderer, limits)
     }

native/src/widget/pane_grid.rs

@@ -835,8 +835,7 @@ fn hovered_split<'a>(
 ) -> Option<(Split, Axis, Rectangle)> {
     splits
         .filter_map(|(split, (axis, region, ratio))| {
-            let bounds =
-                axis.split_line_bounds(*region, *ratio, f32::from(spacing));
+            let bounds = axis.split_line_bounds(*region, *ratio, spacing);
 
             if bounds.contains(cursor_position) {
                 Some((*split, *axis, bounds))

native/src/widget/pane_grid/node.rs

@@ -36,14 +36,11 @@ impl Node {
 
         std::iter::from_fn(move || {
             while let Some(node) = unvisited_nodes.pop() {
-                match node {
-                    Node::Split { id, a, b, .. } => {
-                        unvisited_nodes.push(a);
-                        unvisited_nodes.push(b);
+                if let Node::Split { id, a, b, .. } = node {
+                    unvisited_nodes.push(a);
+                    unvisited_nodes.push(b);
 
-                        return Some(id);
-                    }
-                    _ => {}
+                    return Some(id);
                 }
             }
 
@@ -124,12 +121,9 @@ impl Node {
     }
 
     pub(crate) fn update(&mut self, f: &impl Fn(&mut Node)) {
-        match self {
-            Node::Split { a, b, .. } => {
-                a.update(f);
-                b.update(f);
-            }
-            _ => {}
+        if let Node::Split { a, b, .. } = self {
+            a.update(f);
+            b.update(f);
         }
 
         f(self);

native/src/widget/pane_grid/state.rs

@@ -66,6 +66,11 @@ impl<T> State<T> {
         self.panes.len()
     }
 
+    /// Returns `true` if the amount of panes in the [`State`] is 0.
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
     /// Returns the internal state of the given [`Pane`], if it exists.
     pub fn get(&self, pane: &Pane) -> Option<&T> {
         self.panes.get(pane)

native/src/widget/pick_list.rs

@@ -160,7 +160,7 @@ where
 
     let limits = limits.width(width).height(Length::Shrink).pad(padding);
 
-    let text_size = text_size.unwrap_or(renderer.default_size());
+    let text_size = text_size.unwrap_or_else(|| renderer.default_size());
 
     let max_width = match width {
         Length::Shrink => {
@@ -407,10 +407,9 @@ pub fn draw<T, Renderer>(
 
     let label = selected.map(ToString::to_string);
 
-    if let Some(label) =
-        label.as_ref().map(String::as_str).or_else(|| placeholder)
-    {
-        let text_size = f32::from(text_size.unwrap_or(renderer.default_size()));
+    if let Some(label) = label.as_deref().or(placeholder) {
+        let text_size =
+            f32::from(text_size.unwrap_or_else(|| renderer.default_size()));
 
         renderer.fill_text(Text {
             content: label,
@@ -460,7 +459,7 @@ where
             self.padding,
             self.text_size,
             &self.font,
-            self.placeholder.as_ref().map(String::as_str),
+            self.placeholder.as_deref(),
             &self.options,
         )
     }
@@ -513,7 +512,7 @@ where
             self.padding,
             self.text_size,
             &self.font,
-            self.placeholder.as_ref().map(String::as_str),
+            self.placeholder.as_deref(),
             self.selected.as_ref(),
             self.style,
         )

native/src/widget/radio.rs

@@ -168,11 +168,9 @@ where
                     .width(Length::Units(self.size))
                     .height(Length::Units(self.size)),
             )
-            .push(
-                Text::new(&self.label)
-                    .width(self.width)
-                    .size(self.text_size.unwrap_or(renderer.default_size())),
-            )
+            .push(Text::new(&self.label).width(self.width).size(
+                self.text_size.unwrap_or_else(|| renderer.default_size()),
+            ))
             .layout(renderer, limits)
     }
 

native/src/widget/rule.rs

@@ -36,7 +36,7 @@ where
     /// Creates a vertical [`Rule`] with the given width.
     pub fn vertical(width: u16) -> Self {
         Rule {
-            width: Length::from(Length::Units(width)),
+            width: Length::Units(width),
             height: Length::Fill,
             is_horizontal: false,
             style: Default::default(),

native/src/widget/slider.rs

@@ -303,7 +303,7 @@ pub fn draw<T, R>(
         HandleShape::Rectangle {
             width,
             border_radius,
-        } => (f32::from(width), f32::from(bounds.height), border_radius),
+        } => (f32::from(width), bounds.height, border_radius),
     };
 
     let value = value.into() as f32;
@@ -447,7 +447,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(layout, cursor_position, &self.state)
+        mouse_interaction(layout, cursor_position, self.state)
     }
 }