make clippy happy

Author: karroffel

src/implementation/codegen.rs

@@ -244,7 +244,7 @@ pub(crate) fn generate(
                     make_assertion(
                         mode,
                         ContractType::Requires,
-                        display.clone().into(),
+                        display.clone(),
                         expr,
                         &desc.clone(),
                     )
@@ -282,7 +282,7 @@ pub(crate) fn generate(
                     make_assertion(
                         mode,
                         ContractType::Ensures,
-                        display.clone().into(),
+                        display.clone(),
                         expr,
                         &desc.clone(),
                     )
@@ -369,7 +369,5 @@ pub(crate) fn generate(
 
     func.function.block = Box::new(syn::parse_quote!(#new_block));
 
-    let res = func.function.into_token_stream();
-
-    res.into()
+    func.function.into_token_stream()
 }

src/implementation/doc.rs

@@ -16,7 +16,7 @@ pub(crate) fn generate_attributes(contracts: &[Contract]) -> Vec<Attribute> {
         let content_str = syn::LitStr::new(content, span);
 
         let toks: TokenStream =
-            quote::quote_spanned!( span=> #[doc = #content_str] ).into();
+            quote::quote_spanned!( span=> #[doc = #content_str] );
 
         let parser = Attribute::parse_outer;
 

src/implementation/invariant.rs

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use proc_macro2::TokenStream;
+use quote::ToTokens;
 use syn::{FnArg, ImplItem, ImplItemMethod, Item, ItemFn, ItemImpl};
 
 use crate::implementation::{ContractMode, ContractType, FuncWithContracts};
@@ -54,23 +55,18 @@ fn invariant_impl(
     let name = match mode.name() {
         Some(n) => n.to_string() + "invariant",
         None => {
-            return quote::quote!( #impl_def ).into();
+            return quote::quote!( #impl_def );
         }
     };
 
     let invariant_ident =
         syn::Ident::new(&name, proc_macro2::Span::call_site());
 
-    let invariant: proc_macro2::TokenStream = invariant.into();
-
     fn method_uses_self(method: &ImplItemMethod) -> bool {
         let inputs = &method.sig.inputs;
 
         if !inputs.is_empty() {
-            match inputs[0] {
-                FnArg::Receiver(_) => true,
-                _ => false,
-            }
+            matches!(inputs[0], FnArg::Receiver(_))
         } else {
             false
         }
@@ -94,8 +90,5 @@ fn invariant_impl(
         }
     }
 
-    let toks = quote::quote! {
-        #impl_def
-    };
-    toks.into()
+    impl_def.into_token_stream()
 }

src/implementation/mod.rs

@@ -203,7 +203,7 @@ impl FuncWithContracts {
                     TokenTree::Literal(l) => l.into_token_stream(),
                 };
 
-                Contract::from_toks(ty, mode, toks.into())
+                Contract::from_toks(ty, mode, toks)
             });
 
         contracts.extend(contract_attrs);

src/implementation/parse.rs

@@ -10,7 +10,7 @@ use syn::{Expr, ExprLit, Lit};
 pub(crate) fn parse_attributes(
     attrs: TokenStream,
 ) -> (Vec<Expr>, Vec<TokenStream>, Option<String>) {
-    let segments = segment_input(attrs.into());
+    let segments = segment_input(attrs);
     let mut segments_stream: Vec<TokenStream> = segments
         .iter()
         .map(|x| x.iter().cloned().collect::<TokenStream>())
@@ -42,9 +42,7 @@ pub(crate) fn parse_attributes(
         segments_stream.pop();
     }
 
-    let exprs = conds.into_iter().map(|e| e).collect();
-
-    (exprs, segments_stream, desc)
+    (conds, segments_stream, desc)
 }
 
 // This function rewrites a list of TokenTrees so that the "pseudooperator" for
@@ -156,7 +154,7 @@ fn rewrite(segments: Vec<TokenTree>) -> proc_macro2::TokenStream {
 
             quote::quote_spanned! {
                 span =>
-                (!(#lhs) || (#rhs))
+                (!(#lhs) || #rhs)
             }
         }
     }