Make Clippy happy

crates/kas-core/src/core/widget.rs

@@ -365,7 +365,7 @@ pub trait Layout: WidgetChildren {
     ///
     /// If used, this allows automatic implementation of `size_rules` and
     /// `set_rect` methods. The default case is the empty layout.
-    fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+    fn layout(&mut self) -> layout::Layout<'_> {
         Default::default() // TODO: remove default impl
     }
 
@@ -487,7 +487,7 @@ pub trait Layout: WidgetChildren {
             return None;
         }
         let coord = coord + self.translation();
-        self.layout().find_id(coord).or(Some(self.id()))
+        self.layout().find_id(coord).or_else(|| Some(self.id()))
     }
 
     /// Draw a widget and its children

crates/kas-core/src/layout/visitor.rs

@@ -24,15 +24,9 @@ use std::iter::ExactSizeIterator;
 /// used. We therefore use a simple linked list.
 #[cfg_attr(not(feature = "internal_doc"), doc(hidden))]
 #[cfg_attr(doc_cfg, doc(cfg(internal_doc)))]
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct StorageChain(Option<(Box<StorageChain>, Box<dyn Storage>)>);
 
-impl Default for StorageChain {
-    fn default() -> Self {
-        StorageChain(None)
-    }
-}
-
 impl StorageChain {
     /// Access layout storage
     ///

crates/kas-macros/src/args.rs

@@ -396,9 +396,12 @@ pub enum Handler {
     Discard,
 }
 impl Handler {
-    pub fn is_none(&self) -> bool {
+    fn is_none(&self) -> bool {
         *self == Handler::None
     }
+    fn is_some(&self) -> bool {
+        *self != Handler::None
+    }
     pub fn any_ref(&self) -> Option<&Ident> {
         match self {
             Handler::None | Handler::Discard => None,
@@ -469,7 +472,7 @@ impl Parse for WidgetAttrArgs {
 
 impl ToTokens for WidgetAttrArgs {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-        if !self.update.is_none() || !self.handler.is_none() {
+        if self.update.is_some() || self.handler.is_some() {
             let mut args = TokenStream::new();
             if let Some(ref ident) = self.update {
                 args.append_all(quote! { update = #ident });

crates/kas-widgets/src/adapter/label.rs

@@ -85,7 +85,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let arr = [
                 layout::Layout::single(&mut self.inner),
                 layout::Layout::text(&mut self.label_store, &mut self.label, TextClass::Label),

crates/kas-widgets/src/adapter/reserve.rs

@@ -74,7 +74,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             layout::Layout::single(&mut self.inner)
         }
 

crates/kas-widgets/src/button.rs

@@ -44,7 +44,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let inner = layout::Layout::single(&mut self.inner);
             layout::Layout::button(&mut self.layout_frame, inner, self.color)
         }
@@ -196,7 +196,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let inner = layout::Layout::text(&mut self.layout_text, &mut self.label, TextClass::Button);
             layout::Layout::button(&mut self.layout_frame, inner, self.color)
         }

crates/kas-widgets/src/combobox.rs

@@ -38,7 +38,7 @@ widget! {
     }
 
     impl kas::Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let inner = layout::Layout::text(&mut self.layout_text, &mut self.label, TextClass::Button);
             layout::Layout::button(&mut self.layout_frame, inner, None)
         }

crates/kas-widgets/src/editbox.rs

@@ -182,7 +182,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let inner = layout::Layout::single(&mut self.inner);
             layout::Layout::frame(&mut self.layout_frame, inner)
         }

crates/kas-widgets/src/frame.rs

@@ -36,7 +36,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             make_layout!(self.core; frame(self.inner))
         }
     }

crates/kas-widgets/src/grid.rs

@@ -79,7 +79,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             layout::Layout::grid(
                 self.widgets.iter_mut().map(move |(info, w)| (*info, layout::Layout::single(w))),
                 self.dim,

crates/kas-widgets/src/list.rs

@@ -204,7 +204,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             make_layout!(self.core; slice(self.direction): self.widgets)
         }
     }

crates/kas-widgets/src/menu/menu_entry.rs

@@ -34,7 +34,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let inner = layout::Layout::text(&mut self.layout_label, &mut self.label, TextClass::MenuLabel);
             layout::Layout::frame(&mut self.layout_frame, inner)
         }
@@ -126,7 +126,7 @@ widget! {
     }
 
     impl Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             make_layout!(self.core; row: [self.checkbox, self.label])
         }
 

crates/kas-widgets/src/menu/submenu.rs

@@ -135,7 +135,7 @@ widget! {
     }
 
     impl kas::Layout for Self {
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             let label = layout::Layout::text(&mut self.label_store, &mut self.label, TextClass::MenuLabel);
             layout::Layout::frame(&mut self.frame_store, label)
         }

crates/kas-widgets/src/window.rs

@@ -31,7 +31,7 @@ widget! {
 
     impl Layout for Self {
         #[inline]
-        fn layout<'a>(&'a mut self) -> layout::Layout<'a> {
+        fn layout(&mut self) -> layout::Layout<'_> {
             layout::Layout::single(&mut self.w)
         }