diff options
Diffstat (limited to 'tvix/eval/src/vm')
| -rw-r--r-- | tvix/eval/src/vm/generators.rs | 16 | ||||
| -rw-r--r-- | tvix/eval/src/vm/mod.rs | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index 4fff498fe7c6..7b92c1f0af35 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -13,7 +13,7 @@ pub use genawaiter::rc::Gen; use std::fmt::Display; use std::future::Future; -use crate::value::{PointerEquality, SharedThunkSet}; +use crate::value::PointerEquality; use crate::warnings::{EvalWarning, WarningKind}; use crate::FileType; use crate::NixString; @@ -43,7 +43,7 @@ pub enum VMRequest { ForceValue(Value), /// Request that the VM deep-forces the value. - DeepForceValue(Value, SharedThunkSet), + DeepForceValue(Value), /// Request the value at the given index from the VM's with-stack, in forced /// state. @@ -128,7 +128,7 @@ impl Display for VMRequest { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { VMRequest::ForceValue(v) => write!(f, "force_value({})", v.type_of()), - VMRequest::DeepForceValue(v, _) => { + VMRequest::DeepForceValue(v) => { write!(f, "deep_force_value({})", v.type_of()) } VMRequest::WithValue(_) => write!(f, "with_value"), @@ -294,10 +294,10 @@ impl<'o> VM<'o> { } // Generator has requested a deep-force. - VMRequest::DeepForceValue(value, thunk_set) => { + VMRequest::DeepForceValue(value) => { self.reenqueue_generator(name, span.clone(), generator); - self.enqueue_generator("deep_force", span, |co| { - value.deep_force(co, thunk_set) + self.enqueue_generator("deep_force", span.clone(), |co| { + value.deep_force(co, span) }); return Ok(false); } @@ -606,8 +606,8 @@ pub async fn request_string_coerce( } /// Deep-force any value and return the evaluated result from the VM. -pub async fn request_deep_force(co: &GenCo, val: Value, thunk_set: SharedThunkSet) -> Value { - match co.yield_(VMRequest::DeepForceValue(val, thunk_set)).await { +pub async fn request_deep_force(co: &GenCo, val: Value) -> Value { + match co.yield_(VMRequest::DeepForceValue(val)).await { VMResponse::Value(value) => value, msg => panic!( "Tvix bug: VM responded with incorrect generator message: {}", diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index e11b3b5d13c4..5ab095b22056 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -30,7 +30,7 @@ use crate::{ upvalues::Upvalues, value::{ Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixList, PointerEquality, - SharedThunkSet, Thunk, Value, + Thunk, Value, }, vm::generators::GenCo, warnings::{EvalWarning, WarningKind}, @@ -1202,7 +1202,7 @@ pub struct RuntimeResult { /// before returning. async fn final_deep_force(co: GenCo) -> Result<Value, ErrorKind> { let value = generators::request_stack_pop(&co).await; - Ok(generators::request_deep_force(&co, value, SharedThunkSet::default()).await) + Ok(generators::request_deep_force(&co, value).await) } pub fn run_lambda( |