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

fix(tvix/eval): fix last uses of Vec<Value> -> NixList in builtins

Browse source 
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>
This commit is contained in:
Vincent Ambo 2023-01-07 14:37:50 +03:00 • committed by tazjin
parent e3c1981619
commit 1d59d3ba8f
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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(