Clippy fixes

crates/kas-macros/src/args.rs

@@ -327,16 +327,22 @@ fn parse_impl(in_ident: Option<&Ident>, input: ParseStream) -> Result<ItemImpl>
 }
 
 fn parse_attrs_inner(input: ParseStream, attrs: &mut Vec<Attribute>) -> Result<()> {
-    Ok(while input.peek(Token![#]) && input.peek2(Token![!]) {
+    while input.peek(Token![#]) && input.peek2(Token![!]) {
+        let pound_token = input.parse()?;
+        let style = AttrStyle::Inner(input.parse()?);
         let content;
+        let bracket_token = bracketed!(content in input);
+        let path = content.call(Path::parse_mod_style)?;
+        let tokens = content.parse()?;
         attrs.push(Attribute {
-            pound_token: input.parse()?,
-            style: AttrStyle::Inner(input.parse()?),
-            bracket_token: bracketed!(content in input),
-            path: content.call(Path::parse_mod_style)?,
-            tokens: content.parse()?,
+            pound_token,
+            style,
+            bracket_token,
+            path,
+            tokens,
         });
-    })
+    }
+    Ok(())
 }
 
 fn member(index: usize, ident: Option<Ident>) -> Member {
@@ -399,11 +405,8 @@ impl Parse for WidgetDerive {
         let content;
         let _ = parenthesized!(content in input);
 
-        loop {
-            let lookahead = content.lookahead1();
-            if content.is_empty() {
-                break;
-            }
+        let lookahead = content.lookahead1();
+        if !content.is_empty() {
             return Err(lookahead.error());
         }
 

crates/kas-macros/src/autoimpl.rs

@@ -37,6 +37,7 @@ enum TraitOne {
     SetAccel(Span),
 }
 #[derive(Clone, Copy)]
+#[allow(clippy::enum_variant_names)]
 enum Class {
     Many(TraitMany),
     One(TraitOne),
@@ -105,7 +106,7 @@ impl Parse for AutoImpl {
 
             if empty_or_trailing {
                 if lookahead.peek(Ident) {
-                    const MSG: &'static str = "incompatible: traits targetting a single field and traits targetting multiple fields may not be derived simultaneously";
+                    const MSG: &str = "incompatible: traits targetting a single field and traits targetting multiple fields may not be derived simultaneously";
                     let target = input.parse()?;
                     match class(&target) {
                         Some(Class::Many(trait_)) => {
@@ -341,7 +342,7 @@ fn autoimpl_one(
     clause: &Option<WhereClause>,
     toks: &mut TokenStream,
 ) {
-    fn for_field<'a, T, F: Fn(&Field) -> T>(fields: &'a Fields, mem: &Member, f: F) -> Option<T> {
+    fn for_field<T, F: Fn(&Field) -> T>(fields: &Fields, mem: &Member, f: F) -> Option<T> {
         match (fields, mem) {
             (Fields::Named(ref fields), Member::Named(ref ident)) => {
                 for field in fields.named.iter() {

crates/kas-macros/src/lib.rs

@@ -118,9 +118,9 @@ fn extend_generics(generics: &mut Generics, in_generics: &Generics) {
     if generics.lt_token.is_none() {
         debug_assert!(generics.params.is_empty());
         debug_assert!(generics.gt_token.is_none());
-        generics.lt_token = in_generics.lt_token.clone();
+        generics.lt_token = in_generics.lt_token;
         generics.params = in_generics.params.clone();
-        generics.gt_token = in_generics.gt_token.clone();
+        generics.gt_token = in_generics.gt_token;
     } else if in_generics.lt_token.is_none() {
         debug_assert!(in_generics.params.is_empty());
         debug_assert!(in_generics.gt_token.is_none());

crates/kas-macros/src/make_widget.rs

@@ -165,7 +165,7 @@ pub(crate) fn make_widget(mut args: MakeWidget) -> TokenStream {
                             handler_clauses
                                 .push(parse_quote! { #ty: ::kas::Widget<Msg = #ty_bound> });
                         } else {
-                            return quote! {}.into(); // exit after emitting error
+                            return quote! {}; // exit after emitting error
                         }
                     } else if wattr.args.handler == Handler::Discard {
                         // No type bound on discarded message
@@ -245,7 +245,7 @@ pub(crate) fn make_widget(mut args: MakeWidget) -> TokenStream {
 
     // TODO: we should probably not rely on recursive macro expansion here!
     // (I.e. use direct code generation for Widget derivation, instead of derive.)
-    let toks = (quote! { {
+    let toks = quote! { {
         ::kas::macros::widget! {
             #[derive(Debug)]
             #extra_attrs
@@ -261,8 +261,7 @@ pub(crate) fn make_widget(mut args: MakeWidget) -> TokenStream {
         AnonWidget {
             #field_val_toks
         }
-    } })
-    .into();
+    } };
 
     toks
 }

crates/kas-macros/src/where_clause.rs

@@ -29,6 +29,7 @@ pub struct WhereClause {
 }
 
 /// A single predicate in a `where` clause: `T: Deserialize<'de>`.
+#[allow(clippy::large_enum_variant)]
 pub enum WherePredicate {
     /// A type predicate in a `where` clause: `for<'c> Foo<'c>: Trait<'c>`.
     Type(PredicateType),

crates/kas-macros/src/widget.rs

@@ -268,7 +268,7 @@ pub(crate) fn widget(mut args: Widget) -> TokenStream {
                     #dt
                 }
             }),
-            Err(err) => return err.to_compile_error().into(),
+            Err(err) => return err.to_compile_error(),
         }
 
         match layout::derive(&args.children, layout, &args.layout_data) {
@@ -279,7 +279,7 @@ pub(crate) fn widget(mut args: Widget) -> TokenStream {
                     #fns
                 }
             }),
-            Err(err) => return err.to_compile_error().into(),
+            Err(err) => return err.to_compile_error(),
         }
     }