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

Change-Id: I758fc4f3b9078de7ca6228a75a4351c3e085c4cf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6272
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-08-25 18:39:27 +03:00 committed by tazjin
parent 39b01c3029
commit edee8eecdf
6 changed files with 10 additions and 13 deletions

View file

@ -43,11 +43,10 @@ fn pure_builtins() -> Vec<Builtin> {
Ok(Value::Bool(matches!(args[0], Value::Float(_))))
}),
Builtin::new("isFunction", 1, |args| {
Ok(Value::Bool(match args[0] {
Value::Closure(_) => true,
Value::Builtin(_) => true,
_ => false,
}))
Ok(Value::Bool(matches!(
args[0],
Value::Closure(_) | Value::Builtin(_)
)))
}),
Builtin::new("isInt", 1, |args| {
Ok(Value::Bool(matches!(args[0], Value::Integer(_))))

View file

@ -424,15 +424,14 @@ impl Compiler {
fn compile_has_attr(&mut self, node: ast::HasAttr) {
// Put the attribute set on the stack.
self.compile(node.expr().unwrap());
let mut count = 0;
// Push all path fragments with an operation for fetching the
// next nested element, for all fragments except the last one.
for fragment in node.attrpath().unwrap().attrs() {
for (count, fragment) in node.attrpath().unwrap().attrs().enumerate() {
if count > 0 {
self.chunk().push_op(OpCode::OpAttrOrNotFound);
}
count += 1;
self.compile_attr(fragment);
}
@ -950,7 +949,7 @@ impl Compiler {
self.scope_mut().locals.push(Local {
depth,
name: name.into(),
name,
node: Some(node),
phantom: false,
used: false,

View file

@ -1,7 +1,5 @@
use std::path::PathBuf;
use rnix;
use crate::{
builtins::global_builtins,
errors::{ErrorKind, EvalResult},

View file

@ -7,6 +7,7 @@ pub struct ConstantIdx(pub usize);
#[derive(Clone, Copy, Debug)]
pub struct CodeIdx(pub usize);
#[allow(clippy::enum_variant_names)]
#[warn(variant_size_differences)]
#[derive(Clone, Copy, Debug)]
pub enum OpCode {

View file

@ -91,7 +91,7 @@ impl Display for NixAttrs {
}
AttrsRep::Map(map) => {
for (name, value) in map.iter() {
for (name, value) in map {
write!(f, "{} = {}; ", name.ident_str(), value)?;
}
}

View file

@ -58,7 +58,7 @@ impl Builtin {
}
// Function is not yet ready to be called.
return Ok(Value::Builtin(self));
Ok(Value::Builtin(self))
}
}