diff options
author | Vincent Ambo <mail@tazj.in> | 2022-12-20T14·22+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2022-12-25T18·25+0000 |
commit | 71174f6626cbf100a8428ddc334681e4edfb45e6 (patch) | |
tree | 1e803137d755001700f0e900aa5173bbf43fdf3f /tvix/eval/src/value/thunk.rs | |
parent | 67d508f2ece710714ce8abf6f7deba1fd2440487 (diff) |
fix(tvix/eval): fix current clippy warnings r/5486
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
Diffstat (limited to 'tvix/eval/src/value/thunk.rs')
-rw-r--r-- | tvix/eval/src/value/thunk.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tvix/eval/src/value/thunk.rs b/tvix/eval/src/value/thunk.rs index c7cdfa244183..8813b0039888 100644 --- a/tvix/eval/src/value/thunk.rs +++ b/tvix/eval/src/value/thunk.rs @@ -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"), |