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

refactor(tvix/eval): remove extra Rc<..> around Value::Attrs

Browse source 
The `im::OrdMap` is already small and cheap to copy while sharing
memory, so this is not required anymore.

Only the `KV` variant may have slightly larger content, but in
practice this doesn't seem to make a difference when comparing the two
variants and this one is less complicated.

Change-Id: I64a563b209a2444125653777551373cb2989ca7d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7677
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-12-29 17:34:08 +03:00 • committed by tazjin
parent 91465dc78e
commit 86361f0f4a
5 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ pub enum Value {
Float(f64),
String(NixString),
Path(PathBuf),
Attrs(Rc<NixAttrs>),
Attrs(Box<NixAttrs>),
List(NixList),
Closure(Rc<Closure>), // must use Rc<Closure> here in order to get proper pointer equality
Builtin(Builtin),
@ -154,7 +154,7 @@ where
impl Value {
/// Construct a [`Value::Attrs`] from a [`NixAttrs`].
pub fn attrs(attrs: NixAttrs) -> Self {
Self::Attrs(Rc::new(attrs))
Self::Attrs(Box::new(attrs))
}
}
@ -303,7 +303,7 @@ impl Value {
gen_cast!(as_int, i64, "int", Value::Integer(x), *x);
gen_cast!(as_float, f64, "float", Value::Float(x), *x);
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_attrs, Box<NixAttrs>, "set", Value::Attrs(a), a.clone());
gen_cast!(to_list, NixList, "list", Value::List(l), l.clone());
gen_cast!(
as_closure,