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

feat(tvix/eval): wrap Closure in Rc<> to match cppnix semantics

Browse source 
Change-Id: I595087eff943d38a9fc78a83d37e207bb2ab79bc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7443
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2022-11-27 00:54:39 -08:00 • committed by tazjin
parent b3c34c3c61
commit e04b1697e4
6 changed files with 34 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ pub enum Value {
Path(PathBuf),
Attrs(Rc<NixAttrs>),
List(NixList),
Closure(Closure),
Closure(Rc<Closure>), // must use Rc<Closure> here in order to get proper pointer equality
Builtin(Builtin),
// Internal values that, while they technically exist at runtime,
@ -304,7 +304,13 @@ impl Value {
gen_cast!(to_str, NixString, "string", Value::String(s), s.clone());
gen_cast!(to_attrs, Rc<NixAttrs>, "set", Value::Attrs(a), a.clone());
gen_cast!(to_list, NixList, "list", Value::List(l), l.clone());
gen_cast!(to_closure, Closure, "lambda", Value::Closure(c), c.clone());
gen_cast!(
as_closure,
Rc<Closure>,
"lambda",
Value::Closure(c),
c.clone()
);
gen_cast_mut!(as_list_mut, NixList, "list", List);