Merge pull request #2096 from iced-rs/fix/some-more-lints

Fix some `clippy::pedantic` lints
iced-rs · Sep 20, 2023 · 2f7ff14 · 2f7ff14
2 parents e8b01eb + 33d780f
commit 2f7ff14
Show file tree

Hide file tree

Showing 80 changed files with 291 additions and 257 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,47 @@
+[alias]
+lint = """
+clippy --workspace --no-deps -- \
+  -D warnings \
+  -D clippy::semicolon_if_nothing_returned \
+  -D clippy::trivially-copy-pass-by-ref \
+  -D clippy::default_trait_access \
+  -D clippy::match-wildcard-for-single-variants \
+  -D clippy::redundant-closure-for-method-calls \
+  -D clippy::filter_map_next \
+  -D clippy::manual_let_else \
+  -D clippy::unused_async
+"""
+
+nitpick = """
+clippy --workspace --no-deps -- \
+  -D warnings \
+  -D clippy::pedantic \
+  -A clippy::must_use_candidate \
+  -A clippy::return_self_not_must_use \
+  -A clippy::needless_pass_by_value \
+  -A clippy::cast_precision_loss \
+  -A clippy::cast_sign_loss \
+  -A clippy::cast_possible_truncation \
+  -A clippy::match_same_arms \
+  -A clippy::missing-errors-doc \
+  -A clippy::missing-panics-doc \
+  -A clippy::cast_lossless \
+  -A clippy::doc_markdown \
+  -A clippy::items_after_statements \
+  -A clippy::too_many_lines \
+  -A clippy::module_name_repetitions \
+  -A clippy::if_not_else \
+  -A clippy::redundant_else \
+  -A clippy::used_underscore_binding \
+  -A clippy::cast_possible_wrap \
+  -A clippy::unnecessary_wraps \
+  -A clippy::struct-excessive-bools \
+  -A clippy::float-cmp \
+  -A clippy::single_match_else \
+  -A clippy::unreadable_literal \
+  -A clippy::explicit_deref_methods \
+  -A clippy::map_unwrap_or \
+  -A clippy::unnested_or_patterns \
+  -A clippy::similar_names \
+  -A clippy::unused_self
+"""
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,4 +9,4 @@ jobs:
         components: clippy
     - uses: actions/checkout@master
     - name: Check lints
-      run: cargo clippy --workspace --all-features --all-targets --no-deps -- -D warnings
+      run: cargo lint
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,5 @@ target/
 pkg/
 **/*.rs.bk
 Cargo.lock
-.cargo/
 dist/
 traces/
diff --git a/core/src/element.rs b/core/src/element.rs
@@ -293,7 +293,7 @@ where
     }
 
     fn diff(&self, tree: &mut Tree) {
-        self.widget.diff(tree)
+        self.widget.diff(tree);
     }
 
     fn width(&self) -> Length {
@@ -418,7 +418,7 @@ where
         viewport: &Rectangle,
     ) {
         self.widget
-            .draw(tree, renderer, theme, style, layout, cursor, viewport)
+            .draw(tree, renderer, theme, style, layout, cursor, viewport);
     }
 
     fn mouse_interaction(
@@ -508,7 +508,7 @@ where
     ) {
         self.element
             .widget
-            .operate(state, layout, renderer, operation)
+            .operate(state, layout, renderer, operation);
     }
 
     fn on_event(

diff --git a/core/src/gradient.rs b/core/src/gradient.rs
@@ -95,7 +95,7 @@ impl Linear {
         stops: impl IntoIterator<Item = ColorStop>,
     ) -> Self {
         for stop in stops {
-            self = self.add_stop(stop.offset, stop.color)
+            self = self.add_stop(stop.offset, stop.color);
         }
 
         self

diff --git a/core/src/hasher.rs b/core/src/hasher.rs
@@ -4,7 +4,7 @@ pub struct Hasher(twox_hash::XxHash64);
 
 impl core::hash::Hasher for Hasher {
     fn write(&mut self, bytes: &[u8]) {
-        self.0.write(bytes)
+        self.0.write(bytes);
     }
 
     fn finish(&self) -> u64 {

diff --git a/core/src/mouse/click.rs b/core/src/mouse/click.rs
@@ -24,7 +24,7 @@ pub enum Kind {
 }
 
 impl Kind {
-    fn next(&self) -> Kind {
+    fn next(self) -> Kind {
         match self {
             Kind::Single => Kind::Double,
             Kind::Double => Kind::Triple,

diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
@@ -98,7 +98,7 @@ where
         layout: Layout<'_>,
         cursor: mouse::Cursor,
     ) {
-        self.overlay.draw(renderer, theme, style, layout, cursor)
+        self.overlay.draw(renderer, theme, style, layout, cursor);
     }
 
     /// Applies a [`widget::Operation`] to the [`Element`].
@@ -205,7 +205,7 @@ where
                 state: &mut dyn widget::operation::TextInput,
                 id: Option<&widget::Id>,
             ) {
-                self.operation.text_input(state, id)
+                self.operation.text_input(state, id);
             }
 
             fn custom(&mut self, state: &mut dyn Any, id: Option<&widget::Id>) {
@@ -262,7 +262,7 @@ where
         layout: Layout<'_>,
         cursor: mouse::Cursor,
     ) {
-        self.content.draw(renderer, theme, style, layout, cursor)
+        self.content.draw(renderer, theme, style, layout, cursor);
     }
 
     fn is_over(

diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
@@ -143,7 +143,7 @@ where
                 |(child, layout)| {
                     child.operate(layout, renderer, operation);
                 },
-            )
+            );
         });
     }
 

diff --git a/core/src/shell.rs b/core/src/shell.rs
@@ -71,7 +71,7 @@ impl<'a, Message> Shell<'a, Message> {
         if self.is_layout_invalid {
             self.is_layout_invalid = false;
 
-            f()
+            f();
         }
     }
 

diff --git a/core/src/widget/operation/focusable.rs b/core/src/widget/operation/focusable.rs
@@ -49,7 +49,7 @@ pub fn focus<T>(target: Id) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -85,7 +85,7 @@ where
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
 
         fn finish(&self) -> Outcome<T> {
@@ -132,7 +132,7 @@ pub fn focus_previous<T>() -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -166,7 +166,7 @@ pub fn focus_next<T>() -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -193,7 +193,7 @@ pub fn find_focused() -> impl Operation<Id> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<Id>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
 
         fn finish(&self) -> Outcome<Id> {

diff --git a/core/src/widget/operation/scrollable.rs b/core/src/widget/operation/scrollable.rs
@@ -26,7 +26,7 @@ pub fn snap_to<T>(target: Id, offset: RelativeOffset) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
 
         fn scrollable(
@@ -60,7 +60,7 @@ pub fn scroll_to<T>(target: Id, offset: AbsoluteOffset) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
 
         fn scrollable(

diff --git a/core/src/widget/operation/text_input.rs b/core/src/widget/operation/text_input.rs
@@ -38,7 +38,7 @@ pub fn move_cursor_to_front<T>(target: Id) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -68,7 +68,7 @@ pub fn move_cursor_to_end<T>(target: Id) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -99,7 +99,7 @@ pub fn move_cursor_to<T>(target: Id, position: usize) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 
@@ -128,7 +128,7 @@ pub fn select_all<T>(target: Id) -> impl Operation<T> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
         ) {
-            operate_on_children(self)
+            operate_on_children(self);
         }
     }
 

diff --git a/core/src/widget/tree.rs b/core/src/widget/tree.rs
@@ -61,7 +61,7 @@ impl Tree {
         Renderer: crate::Renderer,
     {
         if self.tag == new.borrow().tag() {
-            new.borrow().diff(self)
+            new.borrow().diff(self);
         } else {
             *self = Self::new(new);
         }
@@ -78,7 +78,7 @@ impl Tree {
             new_children,
             |tree, widget| tree.diff(widget.borrow()),
             |widget| Self::new(widget.borrow()),
-        )
+        );
     }
 
     /// Reconciliates the children of the tree with the provided list of widgets using custom

diff --git a/examples/arc/src/main.rs b/examples/arc/src/main.rs
@@ -37,7 +37,7 @@ impl Application for Arc {
         (
             Arc {
                 start: Instant::now(),
-                cache: Default::default(),
+                cache: Cache::default(),
             },
             Command::none(),
         )

diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
@@ -81,7 +81,7 @@ mod bezier {
         }
 
         pub fn request_redraw(&mut self) {
-            self.cache.clear()
+            self.cache.clear();
         }
     }
 
@@ -100,12 +100,9 @@ mod bezier {
             bounds: Rectangle,
             cursor: mouse::Cursor,
         ) -> (event::Status, Option<Curve>) {
-            let cursor_position =
-                if let Some(position) = cursor.position_in(bounds) {
-                    position
-                } else {
-                    return (event::Status::Ignored, None);
-                };
+            let Some(cursor_position) = cursor.position_in(bounds) else {
+                return (event::Status::Ignored, None);
+            };
 
             match event {
                 Event::Mouse(mouse_event) => {

diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
@@ -35,7 +35,7 @@ impl Application for Clock {
             Clock {
                 now: time::OffsetDateTime::now_local()
                     .unwrap_or_else(|_| time::OffsetDateTime::now_utc()),
-                clock: Default::default(),
+                clock: Cache::default(),
             },
             Command::none(),
         )
@@ -141,7 +141,7 @@ impl<Message> canvas::Program<Message, Renderer> for Clock {
             frame.with_save(|frame| {
                 frame.rotate(hand_rotation(self.now.second(), 60));
                 frame.stroke(&long_hand, thin_stroke());
-            })
+            });
         });
 
         vec![clock]

diff --git a/examples/download_progress/src/main.rs b/examples/download_progress/src/main.rs
@@ -123,7 +123,7 @@ impl Download {
             | State::Errored { .. } => {
                 self.state = State::Downloading { progress: 0.0 };
             }
-            _ => {}
+            State::Downloading { .. } => {}
         }
     }
 

diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
@@ -406,12 +406,9 @@ mod grid {
                 *interaction = Interaction::None;
             }
 
-            let cursor_position =
-                if let Some(position) = cursor.position_in(bounds) {
-                    position
-                } else {
-                    return (event::Status::Ignored, None);
-                };
+            let Some(cursor_position) = cursor.position_in(bounds) else {
+                return (event::Status::Ignored, None);
+            };
 
             let cell = Cell::at(self.project(cursor_position, bounds.size()));
             let is_populated = self.state.contains(&cell);
@@ -472,7 +469,7 @@ mod grid {
                                             * (1.0 / self.scaling),
                                 ))
                             }
-                            _ => None,
+                            Interaction::None => None,
                         };
 
                         let event_status = match interaction {
@@ -676,7 +673,7 @@ mod grid {
                 Interaction::None if cursor.is_over(bounds) => {
                     mouse::Interaction::Crosshair
                 }
-                _ => mouse::Interaction::default(),
+                Interaction::None => mouse::Interaction::default(),
             }
         }
     }

diff --git a/examples/integration/src/controls.rs b/examples/integration/src/controls.rs
@@ -19,7 +19,7 @@ impl Controls {
     pub fn new() -> Controls {
         Controls {
             background_color: Color::BLACK,
-            text: Default::default(),
+            text: String::default(),
         }
     }
 

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
@@ -256,7 +256,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                         {
                             // We clear the frame
-                            let mut render_pass = scene.clear(
+                            let mut render_pass = Scene::clear(
                                 &view,
                                 &mut encoder,
                                 program.background_color(),

diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
@@ -16,7 +16,6 @@ impl Scene {
     }
 
     pub fn clear<'a>(
-        &self,
         target: &'a wgpu::TextureView,
         encoder: &'a mut wgpu::CommandEncoder,
         background_color: Color,
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,5 @@ target/ @@
     pkg/
     **/*.rs.bk
     Cargo.lock
-    .cargo/
     dist/
     traces/