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

chore(tvix/eval): fix all current clippy lints

Browse source 
Change-Id: I28d6af8cb408f8427a75d30b9120aaa809a1ea40
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6784
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-09-24 16:38:16 +03:00 committed by tazjin
parent d54aeb1f20
commit e31f8f735f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ fn pure_builtins() -> Vec<Builtin> {
|args, vm| arithmetic_op!(&*args[0].force(vm)?, &*args[1].force(vm)?, +), |args, vm| arithmetic_op!(&*args[0].force(vm)?, &*args[1].force(vm)?, +),
), ),
Builtin::new("abort", &[true], |args, _| { Builtin::new("abort", &[true], |args, _| {
return Err(ErrorKind::Abort(args[0].to_str()?.to_string())); Err(ErrorKind::Abort(args[0].to_str()?.to_string()))
}), }),
Builtin::new("attrNames", &[true], |args, _| { Builtin::new("attrNames", &[true], |args, _| {
let xs = args[0].to_attrs()?; let xs = args[0].to_attrs()?;
@ -313,7 +313,7 @@ fn pure_builtins() -> Vec<Builtin> {
} }
}), }),
Builtin::new("throw", &[true], |args, _| { Builtin::new("throw", &[true], |args, _| {
return Err(ErrorKind::Throw(args[0].to_str()?.to_string())); Err(ErrorKind::Throw(args[0].to_str()?.to_string()))
}), }),
// coerce_to_string forces for us // coerce_to_string forces for us
Builtin::new("toString", &[false], |args, vm| { Builtin::new("toString", &[false], |args, vm| {

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

@ -18,7 +18,7 @@ impl PartialOrd for VersionPart<'_> {
} }
impl Ord for VersionPart<'_> { impl Ord for VersionPart<'_> {
fn cmp(self: &Self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
match (self, other) { match (self, other) {
(VersionPart::Number(s1), VersionPart::Number(s2)) => { (VersionPart::Number(s1), VersionPart::Number(s2)) => {
// Note: C++ Nix uses `int`, but probably doesn't make a difference // Note: C++ Nix uses `int`, but probably doesn't make a difference

4
tvix/eval/src/compiler/mod.rs
View file

@ -553,7 +553,7 @@ impl Compiler<'_> {
} }
// Push the set onto the stack // Push the set onto the stack
self.compile(slot, set.clone()); self.compile(slot, set);
// Compile each key fragment and emit access instructions. // Compile each key fragment and emit access instructions.
// //
@ -604,7 +604,7 @@ impl Compiler<'_> {
path: ast::Attrpath, path: ast::Attrpath,
default: ast::Expr, default: ast::Expr,
) { ) {
self.compile(slot, set.clone()); self.compile(slot, set);
let mut jumps = vec![]; let mut jumps = vec![];
for fragment in path.attrs() { for fragment in path.attrs() {

2
tvix/eval/src/errors.rs
View file

@ -162,7 +162,7 @@ impl Error {
format!("list index '{}' is out of bounds", index) format!("list index '{}' is out of bounds", index)
} }
ErrorKind::TailEmptyList => format!("'tail' called on an empty list"), ErrorKind::TailEmptyList => "'tail' called on an empty list".to_string(),
ErrorKind::TypeError { expected, actual } => format!( ErrorKind::TypeError { expected, actual } => format!(
"expected value of type '{}', but found a '{}'", "expected value of type '{}', but found a '{}'",