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

Fix some `clippy::pedantic` lints

Author: hecrj

.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
+"""

.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

.gitignore

@@ -2,6 +2,5 @@ target/
 pkg/
 **/*.rs.bk
 Cargo.lock
-.cargo/
 dist/
 traces/

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(

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

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 {

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,

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(

core/src/overlay/group.rs

@@ -143,7 +143,7 @@ where
                 |(child, layout)| {
                     child.operate(layout, renderer, operation);
                 },
-            )
+            );
         });
     }
 

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();
         }
     }