mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): builtins.getAttr: propagate catchables

Browse source 
Change-Id: I84b6b8f8568d57614a03aff0d6069e0bc27357bf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10310
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
This commit is contained in:
Adam Joseph 2023-12-12 03:18:38 -08:00 committed by clbot
parent afba150036
commit 8c8409c0d2
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -466,6 +466,12 @@ mod pure_builtins {
#[builtin("getAttr")] #[builtin("getAttr")]
async fn builtin_get_attr(co: GenCo, key: Value, set: Value) -> Result<Value, ErrorKind> { async fn builtin_get_attr(co: GenCo, key: Value, set: Value) -> Result<Value, ErrorKind> {
if key.is_catchable() {
return Ok(key);
}
if set.is_catchable() {
return Ok(set);
}
let k = key.to_str()?; let k = key.to_str()?;
let xs = set.to_attrs()?; let xs = set.to_attrs()?;

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.exp Normal file
View file

@ -0,0 +1 @@
false

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getAttr-catchable.nix Normal file
View file

@ -0,0 +1 @@
(builtins.tryEval (builtins.getAttr (throw "fred") "bob")).success