From 53fbc75df9ee4aa06eccc9f12bfe9cab8eab5755 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 16 Sep 2022 23:13:02 +0200
Subject: refactor(tvix/eval): fix current clippy lints

Change-Id: I88482453a62955515a0dcc0b243351b2bbac5236
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6618
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
---
 tvix/eval/src/builtins/mod.rs |  2 +-
 tvix/eval/src/value/mod.rs    | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'tvix')

diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index 6098bba1e4..149669015b 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -202,7 +202,7 @@ fn pure_builtins() -> Vec<Builtin> {
         Builtin::new("toString", 1, |args, vm| {
             args[0]
                 .coerce_to_string(CoercionKind::Strong, vm)
-                .map(|s| Value::String(s))
+                .map(Value::String)
         }),
         Builtin::new("typeOf", 1, |args, vm| {
             force!(vm, &args[0], value, {
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs
index dc6202dab5..c4e8221e15 100644
--- a/tvix/eval/src/value/mod.rs
+++ b/tvix/eval/src/value/mod.rs
@@ -126,10 +126,7 @@ impl Value {
             // `__toString` is preferred.
             (Value::Attrs(attrs), _) => {
                 match (attrs.select("__toString"), attrs.select("outPath")) {
-                    (None, None) => Err(ErrorKind::NotCoercibleToString {
-                        from: "set",
-                        kind: kind,
-                    }),
+                    (None, None) => Err(ErrorKind::NotCoercibleToString { from: "set", kind }),
 
                     (Some(f), _) => {
                         // use a closure here to deal with the thunk borrow we need to do below
@@ -165,7 +162,7 @@ impl Value {
                             let guard = t.value();
                             call_to_string(&*guard, vm)
                         } else {
-                            call_to_string(&f, vm)
+                            call_to_string(f, vm)
                         }
                     }
 
@@ -199,7 +196,7 @@ impl Value {
                         Ok(a.concat(&" ".into()).concat(s))
                     })
                     // None from reduce indicates empty iterator
-                    .unwrap_or(Ok("".into()))
+                    .unwrap_or_else(|| Ok("".into()))
             }
 
             (Value::Closure(_), _)
@@ -210,7 +207,7 @@ impl Value {
             | (Value::Float(_), _)
             | (Value::List(_), _) => Err(ErrorKind::NotCoercibleToString {
                 from: self.type_of(),
-                kind: kind,
+                kind,
             }),
 
             (Value::AttrPath(_), _)
@@ -314,7 +311,7 @@ impl PartialEq for Value {
             // compared instead. The compiler should ensure that
             // thunks under comparison have been forced, otherwise it
             // is a bug.
-            (Value::Thunk(lhs), Value::Thunk(rhs)) => &*lhs.value() == &*rhs.value(),
+            (Value::Thunk(lhs), Value::Thunk(rhs)) => *lhs.value() == *rhs.value(),
             (Value::Thunk(lhs), rhs) => &*lhs.value() == rhs,
             (lhs, Value::Thunk(rhs)) => lhs == &*rhs.value(),
 
-- 
cgit 1.4.1