From 0a13d267f0aa0ab1c70b6ac0e0ee8a44071b3d40 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 2 Sep 2022 00:13:30 +0300 Subject: fix(tvix/eval): thread thunk forcing errors through correctly With this, if an error occurs while forcing a thunk (which is very likely) it is threaded through to the top by wrapping it in the ErrorKind::ThunkForce variant. We could use this to generate "stacktrace-like" error output if we wanted, or simply jump through and discard everything except the innermost error. Change-Id: I3c1c8708c2f73ae062815adf490ce935b1979da8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6409 Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/errors.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tvix/eval/src/errors.rs') diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index 59142f2efe64..5f1a24b54b4b 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -48,6 +48,10 @@ pub enum ErrorKind { // These are user-generated errors through builtins. Throw(String), Abort(String), + + // An error occured while forcing a thunk, and needs to be chained + // up. + ThunkForce(Box), } #[derive(Clone, Debug)] -- cgit 1.4.1