diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-09-09T07·10-0700 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-09-24T21·54+0000 |
commit | 926459ce694536432c36d8f0d3fb25b821945852 (patch) | |
tree | 2c5509c92afec80b281f82761f19ee192a85851a /tvix/eval/src/builtins/mod.rs | |
parent | 6015604bd81e064da8253c58825315a3b8e47b30 (diff) |
refactor(tvix/eval): factor CatchableErrorKind out of ErrorKind r/6649
This commit creates a separate enum for "catchable" errors (the kind that `builtins.tryEval` can detect). Change-Id: Ie81d1112526d852255d9842f67045f88eab192af Reviewed-on: https://cl.tvl.fyi/c/depot/+/9287 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: Adam Joseph <adam@westernsemico.com>
Diffstat (limited to 'tvix/eval/src/builtins/mod.rs')
-rw-r--r-- | tvix/eval/src/builtins/mod.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index d701fa08a08d..322f91710898 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -17,7 +17,7 @@ use crate::vm::generators::{self, GenCo}; use crate::warnings::WarningKind; use crate::{ self as tvix_eval, - errors::ErrorKind, + errors::{CatchableErrorKind, ErrorKind}, value::{CoercionKind, NixAttrs, NixList, NixString, SharedThunkSet, Thunk, Value}, }; @@ -893,7 +893,9 @@ mod pure_builtins { #[builtin("throw")] async fn builtin_throw(co: GenCo, message: Value) -> Result<Value, ErrorKind> { - Err(ErrorKind::Throw(message.to_str()?.to_string())) + Err(ErrorKind::CatchableErrorKind(CatchableErrorKind::Throw( + message.to_str()?.to_string(), + ))) } #[builtin("toString")] |