Merge #59

59: Implement clippy suggestions r=korken89 a=AfoHT



Co-authored-by: Henrik Tjäder <henrik@grepit.se>

Author: bors[bot]

src/accessors.rs

@@ -32,10 +32,7 @@ impl App {
     }
 
     fn is_external(task_local: &TaskLocal) -> bool {
-        match task_local {
-            TaskLocal::External => true,
-            _ => false,
-        }
+        matches!(task_local, TaskLocal::External)
     }
 
     pub(crate) fn local_resource_accesses(&self) -> impl Iterator<Item = &Ident> {

src/analyze.rs

@@ -172,7 +172,7 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {
 
     // Collect errors if any and return/halt
     if !error.is_empty() {
-        let mut err = error.iter().next().unwrap().clone();
+        let mut err = error.get(0).unwrap().clone();
         error.iter().for_each(|e| err.combine(e.clone()));
         return Err(err);
     }

src/parse.rs

@@ -107,20 +107,16 @@ fn init_args(tokens: TokenStream2) -> parse::Result<InitArgs> {
                 break;
             }
 
-            // ,
             let _: Token![,] = content.parse()?;
         }
 
         if let Some(locals) = &local_resources {
             for (ident, task_local) in locals {
-                match task_local {
-                    TaskLocal::External => {
-                        return Err(parse::Error::new(
-                            ident.span(),
-                            "only declared local resources are allowed in init",
-                        ));
-                    }
-                    _ => {}
+                if let TaskLocal::External = task_local {
+                    return Err(parse::Error::new(
+                        ident.span(),
+                        "only declared local resources are allowed in init",
+                    ));
                 }
             }
         }

src/parse/monotonic.rs

@@ -25,7 +25,7 @@ impl Monotonic {
 
         let FilterAttrs { cfgs, attrs, .. } = util::filter_attributes(item.attrs.clone());
 
-        if attrs.len() > 0 {
+        if !attrs.is_empty() {
             return Err(parse::Error::new(
                 attrs[0].path.span(),
                 "Monotonic does not support attributes other than `#[cfg]`",

src/parse/util.rs

@@ -279,7 +279,7 @@ fn extract_init_resource_name_ident(ty: Type) -> Result<Ident, ()> {
     }
 }
 
-/// Checks Init's return type and returns the user provided types for use in the analysis
+/// Checks Init's return type, return the user provided types for analysis
 pub fn type_is_init_return(ty: &ReturnType, name: &str) -> Result<(Ident, Ident), ()> {
     match ty {
         ReturnType::Default => Err(()),
@@ -291,13 +291,11 @@ pub fn type_is_init_return(ty: &ReturnType, name: &str) -> Result<(Ident, Ident)
                 //
                 // We check the length and the last one here, analysis checks that the user
                 // provided structs are correct.
-                if t.elems.len() == 3 {
-                    if type_is_path(&t.elems[2], &[name, "Monotonics"]) {
-                        return Ok((
-                            extract_init_resource_name_ident(t.elems[0].clone())?,
-                            extract_init_resource_name_ident(t.elems[1].clone())?,
-                        ));
-                    }
+                if t.elems.len() == 3 && type_is_path(&t.elems[2], &[name, "Monotonics"]) {
+                    return Ok((
+                        extract_init_resource_name_ident(t.elems[0].clone())?,
+                        extract_init_resource_name_ident(t.elems[1].clone())?,
+                    ));
                 }
 
                 Err(())