diff options
author | Vincent Ambo <mail@tazj.in> | 2023-01-07T11·37+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2023-01-08T11·11+0000 |
commit | 1d59d3ba8f0f77d33e246984447c0ae5b3889316 (patch) | |
tree | a10068625b63cb2e18933ab4fe2fdde232641d39 /tvix/eval/src/value/mod.rs | |
parent | e3c198161960ffe25be4c88a6b0277c41a95d817 (diff) |
fix(tvix/eval): fix last uses of Vec<Value> -> NixList in builtins r/5629
Change-Id: I0d71b82eb7ddc1e457b0996b0668006f55f56751 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7790 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
-rw-r--r-- | tvix/eval/src/value/mod.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index b5585923a301..49ab62fd180e 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -542,12 +542,6 @@ impl From<PathBuf> for Value { } } -impl From<Vec<Value>> for Value { - fn from(val: Vec<Value>) -> Self { - Self::List(NixList::from_vec(val)) - } -} - impl TryFrom<serde_json::Value> for Value { type Error = ErrorKind; @@ -568,11 +562,12 @@ impl TryFrom<serde_json::Value> for Value { } } serde_json::Value::String(s) => Ok(s.into()), - serde_json::Value::Array(a) => Ok(a - .into_iter() - .map(Value::try_from) - .collect::<Result<Vec<_>, _>>()? - .into()), + serde_json::Value::Array(a) => Ok(Value::List( + a.into_iter() + .map(Value::try_from) + .collect::<Result<imbl::Vector<_>, _>>()? + .into(), + )), serde_json::Value::Object(obj) => { match (obj.len(), obj.get("name"), obj.get("value")) { (2, Some(name), Some(value)) => Ok(Self::attrs(NixAttrs::from_kv( |