From ad566999ca81e5d584acb5107e327a1aec9fdd5a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 9 Dec 2023 00:58:30 -0800 Subject: fix(tvix/eval): preserve catchables in nix_cmp_ordering(), fix b/338 This commit fixes b/338 by properly propagating catchables through comparison operations. Change-Id: I6b0283a40f228ecf9a6398d24c060bdacb1077cf Reviewed-on: https://cl.tvl.fyi/c/depot/+/10221 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: Adam Joseph --- tvix/eval/src/builtins/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tvix/eval/src/builtins/mod.rs') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 1a34ea5dfb..09b341886c 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -611,10 +611,11 @@ mod pure_builtins { #[builtin("lessThan")] async fn builtin_less_than(co: GenCo, x: Value, y: Value) -> Result { let span = generators::request_span(&co).await; - Ok(Value::Bool(matches!( - x.nix_cmp_ordering(y, co, span).await?, - Ordering::Less - ))) + match x.nix_cmp_ordering(y, co, span).await? { + Err(cek) => Ok(Value::Catchable(cek)), + Ok(Ordering::Less) => Ok(Value::Bool(true)), + Ok(_) => Ok(Value::Bool(false)), + } } #[builtin("listToAttrs")] -- cgit 1.4.1