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

10
tvix/eval/src/value/thunk.rs
View file

@ -143,7 +143,7 @@ impl Thunk {
}) => vm.enter_frame(lambda, upvalues, arg_count)?,
}
match trampoline.continuation {
None => break (),
None => break,
Some(cont) => {
trampoline = cont(vm)?;
continue;
@ -203,7 +203,7 @@ impl Thunk {
return Ok(Trampoline {
action: Some(TrampolineAction::EnterFrame {
lambda,
upvalues: upvalues.clone(),
upvalues,
arg_count: 0,
light_span: light_span.clone(),
}),
@ -212,10 +212,10 @@ impl Thunk {
self_clone.0.replace(ThunkRepr::Evaluated(vm.pop()));
assert!(matches!(should_be_blackhole, ThunkRepr::Blackhole));
vm.push(Value::Thunk(self_clone));
return Self::force_trampoline(vm).map_err(|kind| Error {
Self::force_trampoline(vm).map_err(|kind| Error {
kind,
span: light_span.span(),
});
})
})),
});
}
@ -268,7 +268,7 @@ impl Thunk {
panic!("Thunk::value called on an unfinalised closure");
}
*/
return value;
value
}
ThunkRepr::Blackhole => panic!("Thunk::value called on a black-holed thunk"),
ThunkRepr::Suspended { .. } => panic!("Thunk::value called on a suspended thunk"),