From 4b3f27ebc91c34c4a6a33d164e4d9f5fc975a48e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 13 Dec 2023 05:53:58 -0800 Subject: fix(tvix/eval): propagate catchables through builtins.attrNames Change-Id: Id14e39543239272aed041998fd9a78465c9cb8b2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10359 Autosubmit: Adam Joseph Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 3 +++ tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.exp | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.nix | 1 + 3 files changed, 5 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.nix diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index d75249e94a..341ee60969 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -121,6 +121,9 @@ mod pure_builtins { #[builtin("attrNames")] async fn builtin_attr_names(co: GenCo, set: Value) -> Result { + if set.is_catchable() { + return Ok(set); + } let xs = set.to_attrs()?; let mut output = Vec::with_capacity(xs.len()); diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.exp new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.nix new file mode 100644 index 0000000000..75531d56a3 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-attrNames.nix @@ -0,0 +1 @@ +(builtins.tryEval (builtins.attrNames (throw "fred"))).success -- cgit 1.4.1