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

8
tvix/eval/src/builtins/mod.rs
View file

@ -21,7 +21,7 @@ use crate::{
vm::VM,
};
use crate::{arithmetic_op, unwrap_or_clone_rc};
use crate::arithmetic_op;
use self::versions::{VersionPart, VersionPartsIter};
@ -1022,8 +1022,8 @@ fn placeholders() -> Vec<Builtin> {
// values on the fields that a real derivation would contain.
//
// Crucially this means we do not yet *validate* the values either.
let attrs = unwrap_or_clone_rc(args[0].to_attrs()?);
let attrs = attrs.update(NixAttrs::from_iter(
let input = args[0].to_attrs()?;
let attrs = input.update(NixAttrs::from_iter(
[
(
"outPath",
@ -1038,7 +1038,7 @@ fn placeholders() -> Vec<Builtin> {
.into_iter(),
));
Ok(Value::Attrs(Rc::new(attrs)))
Ok(Value::Attrs(Box::new(attrs)))
},
),
]