maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): fix current clippy warnings

Browse source 
It's been a while since the last time, so quite a lot of stuff has
accumulated here.

Change-Id: I0762827c197b30a917ff470fd8ae8f220f6ba247
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7597
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-12-20 17:22:56 +03:00 • committed by clbot
parent 67d508f2ec
commit 71174f6626
17 changed files with 69 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,7 +414,7 @@ mod pure_builtins {
let mut res: BTreeMap<NixString, Vec<Value>> = BTreeMap::new();
for val in list.to_list()? {
let key = vm.call_with(&f, [val.clone()])?.force(vm)?.to_str()?;
res.entry(key).or_insert_with(|| vec![]).push(val);
res.entry(key).or_insert_with(std::vec::Vec::new).push(val);
}
Ok(Value::attrs(NixAttrs::from_iter(
res.into_iter()
@ -688,7 +688,7 @@ mod pure_builtins {
// We already applied a from->to with an empty from
// transformation.
// Let's skip it so that we don't loop infinitely
if empty_string_replace && from.as_str().len() == 0 {
if empty_string_replace && from.as_str().is_empty() {
continue;
}
@ -698,7 +698,7 @@ mod pure_builtins {
i += from.len();
// remember if we applied the empty from->to
empty_string_replace = from.as_str().len() == 0;
empty_string_replace = from.as_str().is_empty();
continue 'outer;
}
@ -719,7 +719,7 @@ mod pure_builtins {
let from = elem.0.to_str()?;
let to = elem.1.to_str()?;
if from.as_str().len() == 0 {
if from.as_str().is_empty() {
res += &to;
break;
}
@ -866,9 +866,7 @@ mod pure_builtins {
let len = len as usize;
let end = cmp::min(beg + len, x.as_str().len());
Ok(Value::String(
x.as_str()[(beg as usize)..(end as usize)].into(),
))
Ok(Value::String(x.as_str()[beg..end].into()))
}
#[builtin("tail")]
@ -1070,10 +1068,7 @@ pub fn global_builtins(source: SourceCode) -> GlobalsMapFunc {
// We need to insert import into the builtins, but the
// builtins passed to import must have import *in it*.
let import = Value::Builtin(crate::builtins::impure::builtins_import(
globals,
source.clone(),
));
let import = Value::Builtin(crate::builtins::impure::builtins_import(globals, source));
map.insert("import", import);
};