mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): fix current clippy lints

Browse source 
Change-Id: I88482453a62955515a0dcc0b243351b2bbac5236
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6618
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-09-16 23:13:02 +02:00
parent db093ad10c
commit 53fbc75df9
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/eval/src/builtins/mod.rs
View file

@ -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, {

13
tvix/eval/src/value/mod.rs
View file

@ -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(),