From 29464fc65be0fb98b1ee1592ef99ed102be0e073 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 12 Dec 2023 03:01:58 -0800 Subject: fix(tvix/eval): propagate catchables through builtins.splitVersion This fixes our implementation of builtins.splitVersion so it propagates catchables like cppnix does. Change-Id: Id5d83ea76229f8c8f202aa42353cb609e67de43f Reviewed-on: https://cl.tvl.fyi/c/depot/+/10305 Autosubmit: Adam Joseph Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/eval/src/builtins/mod.rs | 3 +++ .../src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.exp | 1 + .../src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.nix | 1 + 3 files changed, 5 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.nix (limited to 'tvix/eval') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index b7649e7995..d85d6567ea 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -931,6 +931,9 @@ mod pure_builtins { #[builtin("splitVersion")] async fn builtin_split_version(co: GenCo, s: Value) -> Result { + if s.is_catchable() { + return Ok(s); + } let s = s.to_str()?; let s = VersionPartsIter::new(s.as_str()); diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.exp new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.nix new file mode 100644 index 0000000000..0668ec7de2 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-splitversion-catchable.nix @@ -0,0 +1 @@ +(builtins.tryEval (builtins.splitVersion (throw "fred"))).success -- cgit 1.4.1