ref: cargo clippy

Author: raphael-goetz

taurus/src/context/executor.rs

@@ -90,15 +90,15 @@ impl<'a> Executor<'a> {
                     .get(i)
                     .copied()
                     .unwrap_or(ParameterNode::Eager);
-                if matches!(mode, ParameterNode::Eager) {
-                    if let Argument::Thunk(id) = *a {
-                        match self.execute(id) {
-                            Signal::Success(v) => *a = Argument::Eval(v),
-                            s @ (Signal::Failure(_)
-                            | Signal::Return(_)
-                            | Signal::Respond(_)
-                            | Signal::Stop) => return s,
-                        }
+                if matches!(mode, ParameterNode::Eager)
+                    && let Argument::Thunk(id) = *a
+                {
+                    match self.execute(id) {
+                        Signal::Success(v) => *a = Argument::Eval(v),
+                        s @ (Signal::Failure(_)
+                        | Signal::Return(_)
+                        | Signal::Respond(_)
+                        | Signal::Stop) => return s,
                     }
                 }
             }

taurus/src/implementation/array.rs

@@ -64,12 +64,7 @@ fn at(args: &[Argument], _ctx: &mut Context, _run: &mut dyn FnMut(i64) -> Signal
 fn concat(args: &[Argument], _ctx: &mut Context, _run: &mut dyn FnMut(i64) -> Signal) -> Signal {
     args!(args => lhs_v: Value, rhs_v: Value);
 
-    let Kind::ListValue(lhs) = lhs_v
-        .kind
-        .clone()
-        .ok_or_else(|| ())
-        .unwrap_or_else(|_| Kind::NullValue(0))
-    else {
+    let Kind::ListValue(lhs) = lhs_v.kind.clone().ok_or(()).unwrap_or(Kind::NullValue(0)) else {
         return Signal::Failure(RuntimeError::simple(
             "InvalidArgumentRuntimeError",
             format!(
@@ -78,12 +73,7 @@ fn concat(args: &[Argument], _ctx: &mut Context, _run: &mut dyn FnMut(i64) -> Si
             ),
         ));
     };
-    let Kind::ListValue(rhs) = rhs_v
-        .kind
-        .clone()
-        .ok_or_else(|| ())
-        .unwrap_or_else(|_| Kind::NullValue(0))
-    else {
+    let Kind::ListValue(rhs) = rhs_v.kind.clone().ok_or(()).unwrap_or(Kind::NullValue(0)) else {
         return Signal::Failure(RuntimeError::simple(
             "InvalidArgumentRuntimeError",
             format!(
@@ -167,11 +157,15 @@ fn find(args: &[Argument], _ctx: &mut Context, _run: &mut dyn FnMut(i64) -> Sign
     }
 
     let mut i = 0usize;
-    let item = array.values.iter().cloned().find(|_| {
-        let keep = *preds.get(i).unwrap_or(&false);
-        i += 1;
-        keep
-    });
+    let item = array
+        .values
+        .iter()
+        .find(|&_| {
+            let keep = *preds.get(i).unwrap_or(&false);
+            i += 1;
+            keep
+        })
+        .cloned();
 
     match item {
         Some(v) => Signal::Success(v),

taurus/src/implementation/object.rs

@@ -1,10 +1,10 @@
 use tucana::shared::{Struct, Value, value::Kind};
 
+use crate::context::Context;
 use crate::context::argument::Argument;
 use crate::context::macros::args;
 use crate::context::registry::{HandlerFn, HandlerFunctionEntry, IntoFunctionEntry};
 use crate::context::signal::Signal;
-use crate::{context::Context, error::RuntimeError};
 
 pub fn collect_object_functions() -> Vec<(&'static str, HandlerFunctionEntry)> {
     vec![