diff options
author | Florian Klink <flokli@flokli.de> | 2024-05-23T13·10+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-05-23T14·50+0000 |
commit | 649a862ae14d334832831725cf712f737891032c (patch) | |
tree | 27ce25c89b6bd414529bb69b2812f2d9de9a35f7 /tvix/glue/src/builtins | |
parent | ec8d79f3db2fc3a5ab7af048209cc2cc5ab14bd3 (diff) |
feat(tvix/eval): rm NixContext::join, add take_context & IntoIterator r/8164
In places where we want to extend context with that from another NixString, use take_context() to split it off, then call .extend(), making use of IntoIterator to avoid a bunch of clones. Change-Id: I2460141a3ed776c64c36132b2203b6a1d710b922 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11705 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: edef <edef@edef.eu>
Diffstat (limited to 'tvix/glue/src/builtins')
-rw-r--r-- | tvix/glue/src/builtins/derivation.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs index a7742ae40a66..7878ce0ed9ad 100644 --- a/tvix/glue/src/builtins/derivation.rs +++ b/tvix/glue/src/builtins/derivation.rs @@ -372,12 +372,12 @@ pub(crate) mod derivation_builtins { return Ok(val); } - let (val_json, mut context) = match val.into_contextful_json(&co).await? { + let (val_json, context) = match val.into_contextful_json(&co).await? { Ok(v) => v, Err(cek) => return Ok(Value::from(cek)), }; - input_context = input_context.join(&mut context); + input_context.extend(context.into_iter()); // No need to check for dups, we only iterate over every attribute name once structured_attrs.insert(arg_name.to_owned(), val_json); |