From 86361f0f4a754370b42ae3568ece4bc43850f36b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 29 Dec 2022 17:34:08 +0300 Subject: refactor(tvix/eval): remove extra Rc<..> around Value::Attrs 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 Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/eval/src/builtins') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 9f03cd85b8e4..2e043a1b104f 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -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 { // 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 { .into_iter(), )); - Ok(Value::Attrs(Rc::new(attrs))) + Ok(Value::Attrs(Box::new(attrs))) }, ), ] -- cgit 1.4.1