Apply some Clippy suggestions

kas-gui · Apr 24, 2024 · d0379ee · d0379ee
1 parent 04d3fd8
commit d0379ee
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 38 deletions.
diff --git a/crates/kas-core/src/app/window.rs b/crates/kas-core/src/app/window.rs
@@ -338,9 +338,7 @@ impl<A: AppData, G: AppGraphicsBuilder, T: Theme<G::Shared>> Window<A, G, T> {
     }
 
     pub(super) fn update_timer(&mut self, state: &mut AppState<A, G, T>) -> Option<Instant> {
-        let Some(ref window) = self.window else {
-            return None;
-        };
+        let window = self.window.as_ref()?;
 
         let widget = self.widget.as_node(&state.data);
         let mut messages = MessageStack::new();

diff --git a/crates/kas-core/src/event/cx/mod.rs b/crates/kas-core/src/event/cx/mod.rs
@@ -15,7 +15,6 @@ use std::future::Future;
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
 use std::time::Instant;
-use std::u16;
 
 use super::config::WindowConfig;
 use super::*;

diff --git a/crates/kas-macros/src/make_layout.rs b/crates/kas-macros/src/make_layout.rs
@@ -70,30 +70,26 @@ impl Tree {
         &self,
         children: I,
     ) -> std::result::Result<Toks, (Span, &'static str)> {
-        match &self.0 {
-            layout => {
-                let mut v = Vec::new();
-                layout.nav_next(children, &mut v).map(|()| {
-                    quote! {
-                        fn nav_next(&self, reverse: bool, from: Option<usize>) -> Option<usize> {
-                            let mut iter = [#(#v),*].into_iter();
-                            if !reverse {
-                                if let Some(wi) = from {
-                                    let _ = iter.find(|x| *x == wi);
-                                }
-                                iter.next()
-                            } else {
-                                let mut iter = iter.rev();
-                                if let Some(wi) = from {
-                                    let _ = iter.find(|x| *x == wi);
-                                }
-                                iter.next()
-                            }
+        let mut v = Vec::new();
+        self.0.nav_next(children, &mut v).map(|()| {
+            quote! {
+                fn nav_next(&self, reverse: bool, from: Option<usize>) -> Option<usize> {
+                    let mut iter = [#(#v),*].into_iter();
+                    if !reverse {
+                        if let Some(wi) = from {
+                            let _ = iter.find(|x| *x == wi);
                         }
+                        iter.next()
+                    } else {
+                        let mut iter = iter.rev();
+                        if let Some(wi) = from {
+                            let _ = iter.find(|x| *x == wi);
+                        }
+                        iter.next()
                     }
-                })
+                }
             }
-        }
+        })
     }
 
     /// If field `ident` is included in the layout, return Span of usage
@@ -477,7 +473,7 @@ impl Layout {
                     );
 
                     // Clear remainder of input stream to avoid a redundant error
-                    let _ = input.step(|cursor| {
+                    input.step(|cursor| {
                         let mut rest = *cursor;
                         while let Some((_, next)) = rest.token_tree() {
                             rest = next;
@@ -1090,12 +1086,10 @@ impl Layout {
             }
             Layout::Widget(ident, _) => {
                 for (i, child) in children.enumerate() {
-                    if let ChildIdent::CoreField(ref child_ident) = child.ident {
-                        if let Member::Named(ref ci) = child_ident {
-                            if *ident == *ci {
-                                output.push(i);
-                                return Ok(());
-                            }
+                    if let ChildIdent::CoreField(Member::Named(ref ci)) = child.ident {
+                        if *ident == *ci {
+                            output.push(i);
+                            return Ok(());
                         }
                     }
                 }

diff --git a/crates/kas-macros/src/widget.rs b/crates/kas-macros/src/widget.rs
@@ -180,7 +180,7 @@ pub struct Child {
 impl Child {
     pub fn new_core(ident: Member) -> Self {
         Child {
-            ident: ChildIdent::CoreField(ident.into()),
+            ident: ChildIdent::CoreField(ident),
             attr_span: None,
             data_binding: None,
         }

diff --git a/crates/kas-resvg/src/canvas.rs b/crates/kas-resvg/src/canvas.rs
@@ -113,13 +113,13 @@ impl_scope! {
         /// Use [`Self::with_size`] or [`Self::with_scaling`] to set the initial size.
         #[inline]
         pub fn new(program: P) -> Self {
-            let mut scaling = PixmapScaling::default();
-            scaling.size = LogicalSize(128.0, 128.0);
-            scaling.stretch = Stretch::High;
-
             Canvas {
                 core: Default::default(),
-                scaling,
+                scaling: PixmapScaling {
+                    size: LogicalSize(128.0, 128.0),
+                    stretch: Stretch::High,
+                    ..Default::default()
+                },
                 inner: State::Initial(program),
                 image: None,
             }