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

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

Browse source 
This commit fixes builtins.filter so it propagates catchables
correctly.

Change-Id: Ib23a383bc5e272e42052205ffd1e94649a0ebc47
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10313
Autosubmit: Adam Joseph <adam@westernsemico.com>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Adam Joseph 2023-12-12 03:33:18 -08:00 committed by clbot
parent 25dd1458b9
commit 1ddfed9825
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,8 +316,11 @@ mod pure_builtins {
for value in list {
let result = generators::request_call_with(&co, pred.clone(), [value.clone()]).await;
if generators::request_force(&co, result).await.as_bool()? {
let verdict = generators::request_force(&co, result).await;
if verdict.is_catchable() {
return Ok(verdict);
}
if verdict.as_bool()? {
out.push_back(value);
}
}

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

@ -0,0 +1 @@
false

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

@ -0,0 +1 @@
(builtins.tryEval (builtins.filter (_: throw "fred") [ 3 ])).success