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

refactor(tvix/eval) remove Value::DynamicUpvalueMissing

Browse source 
I believe this variant is left over from a previous implementation.
If not, please let me know.

Signed-off-by: Adam Joseph <adam@westernsemico.com>
Change-Id: I02a3bf2f63794d09e96a5a92a034c0ad3d1ff221
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7027
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Adam Joseph 2022-10-15 16:45:40 -07:00 • committed by clbot
parent 8cbf308be4
commit 96dcc51297
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/eval/src/value/mod.rs
View file

@ -44,7 +44,6 @@ pub enum Value {
// are never returned to or created directly by users. // are never returned to or created directly by users.
Thunk(Thunk), Thunk(Thunk),
AttrNotFound, AttrNotFound,
DynamicUpvalueMissing(NixString),
Blueprint(Rc<Lambda>), Blueprint(Rc<Lambda>),
DeferredUpvalue(StackIdx), DeferredUpvalue(StackIdx),
} }
@ -240,7 +239,6 @@ impl Value {
}), }),
(Value::AttrNotFound, _) (Value::AttrNotFound, _)
| (Value::DynamicUpvalueMissing(_), _)
| (Value::Blueprint(_), _) | (Value::Blueprint(_), _)
| (Value::DeferredUpvalue(_), _) => { | (Value::DeferredUpvalue(_), _) => {
panic!("tvix bug: .coerce_to_string() called on internal value") panic!("tvix bug: .coerce_to_string() called on internal value")
@ -263,7 +261,6 @@ impl Value {
// Internal types // Internal types
Value::Thunk(_) Value::Thunk(_)
| Value::AttrNotFound | Value::AttrNotFound
| Value::DynamicUpvalueMissing(_)
| Value::Blueprint(_) | Value::Blueprint(_)
| Value::DeferredUpvalue(_) => "internal", | Value::DeferredUpvalue(_) => "internal",
} }
@ -365,9 +362,6 @@ impl Display for Value {
Value::AttrNotFound => f.write_str("internal[not found]"), Value::AttrNotFound => f.write_str("internal[not found]"),
Value::Blueprint(_) => f.write_str("internal[blueprint]"), Value::Blueprint(_) => f.write_str("internal[blueprint]"),
Value::DeferredUpvalue(_) => f.write_str("internal[deferred_upvalue]"), Value::DeferredUpvalue(_) => f.write_str("internal[deferred_upvalue]"),
Value::DynamicUpvalueMissing(name) => {
write!(f, "internal[no_dyn_upvalue({name})]")
}
} }
} }
} }

5
tvix/eval/src/vm.rs
View file

@ -836,10 +836,7 @@ impl<'o> VM<'o> {
// If any of these internal values are encountered here a // If any of these internal values are encountered here a
// critical error has happened (likely a compiler bug). // critical error has happened (likely a compiler bug).
Value::AttrNotFound Value::AttrNotFound | Value::Blueprint(_) | Value::DeferredUpvalue(_) => {
| Value::DynamicUpvalueMissing(_)
| Value::Blueprint(_)
| Value::DeferredUpvalue(_) => {
panic!("tvix bug: internal value left on stack: {:?}", value) panic!("tvix bug: internal value left on stack: {:?}", value)
} }