From 926459ce694536432c36d8f0d3fb25b821945852 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 9 Sep 2023 00:10:06 -0700 Subject: refactor(tvix/eval): factor CatchableErrorKind out of ErrorKind 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 Autosubmit: Adam Joseph --- tvix/eval/src/compiler/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tvix/eval/src/compiler/mod.rs') diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 3ab0e4d93360..5c2825507f1e 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -27,7 +27,7 @@ use std::rc::{Rc, Weak}; use std::sync::Arc; use crate::chunk::Chunk; -use crate::errors::{Error, ErrorKind, EvalResult}; +use crate::errors::{CatchableErrorKind, Error, ErrorKind, EvalResult}; use crate::observer::CompilerObserver; use crate::opcode::{CodeIdx, ConstantIdx, Count, JumpOffset, OpCode, UpvalueIdx}; use crate::spans::LightSpan; @@ -398,7 +398,9 @@ impl Compiler<'_> { if raw_path.len() == 2 { return self.emit_error( node, - ErrorKind::NixPathResolution("Empty <> path not allowed".into()), + ErrorKind::CatchableErrorKind(CatchableErrorKind::NixPathResolution( + "Empty <> path not allowed".into(), + )), ); } let path = &raw_path[1..(raw_path.len() - 1)]; -- cgit 1.4.1