diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-09-10T05·02-0700 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-09-24T21·54+0000 |
commit | 05f42519b53575ad3235b5e0a0cd7d71f04076a5 (patch) | |
tree | 82c5bdb55450615c0cf3169e25668426c9798e09 /tvix/eval/src/compiler/mod.rs | |
parent | 926459ce694536432c36d8f0d3fb25b821945852 (diff) |
fix(tvix/eval): fix b/281 by adding Value::Catchable r/6650
This commit makes catchable errors a variant of Value. The main downside of this approach is that we lose the ability to use Rust's `?` syntax for propagating catchable errors. Change-Id: Ibe89438d8a70dcec29e016df692b5bf88a5cad13 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9289 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/compiler/mod.rs')
-rw-r--r-- | tvix/eval/src/compiler/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 5c2825507f1e..cfd50bec5790 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -396,11 +396,11 @@ impl Compiler<'_> { } else if raw_path.starts_with('<') { // TODO: decide what to do with findFile if raw_path.len() == 2 { - return self.emit_error( - node, - ErrorKind::CatchableErrorKind(CatchableErrorKind::NixPathResolution( + return self.emit_constant( + Value::Catchable(CatchableErrorKind::NixPathResolution( "Empty <> path not allowed".into(), )), + node, ); } let path = &raw_path[1..(raw_path.len() - 1)]; |