diff options
author | William Carroll <wpcarro@gmail.com> | 2022-09-06T20·56-0700 |
---|---|---|
committer | wpcarro <wpcarro@gmail.com> | 2022-10-10T19·36+0000 |
commit | 41ddc37725a59b4af0f7043a7fd66b3fe48f935d (patch) | |
tree | 09cc3a4b6456546697d0d28f91f80be74b75ce00 /tvix/eval/src/errors.rs | |
parent | 899fbdbddb93050f26236ff7c72e7ae4704d497b (diff) |
feat(tvix/eval): Support builtins.readDir r/5083
Co-authored-by: Griffin Smith <root@gws.fyi> Change-Id: I5ff19efbe87d8f571f22ab0480500505afa624c5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6552 Autosubmit: wpcarro <wpcarro@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/errors.rs')
-rw-r--r-- | tvix/eval/src/errors.rs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index a2f09e98fb2e..a7d54d51bb27 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -1,5 +1,6 @@ use crate::spans::ToSpan; use crate::value::CoercionKind; +use std::io; use std::path::PathBuf; use std::rc::Rc; use std::sync::Arc; @@ -121,6 +122,12 @@ pub enum ErrorKind { errors: Vec<Error>, }, + /// I/O errors + IO { + path: Option<PathBuf>, + error: Rc<io::Error>, + }, + /// Tvix internal warning for features triggered by users that are /// not actually implemented yet, and without which eval can not /// proceed. @@ -142,6 +149,15 @@ impl From<Error> for ErrorKind { } } +impl From<io::Error> for ErrorKind { + fn from(e: io::Error) -> Self { + ErrorKind::IO { + path: None, + error: Rc::new(e), + } + } +} + #[derive(Clone, Debug)] pub struct Error { pub kind: ErrorKind, @@ -306,6 +322,14 @@ to a missing value in the attribute set(s) included via `with`."#, ) } + ErrorKind::IO { path, error } => { + write!(f, "I/O error: ")?; + if let Some(path) = path { + write!(f, "{}: ", path.display())?; + } + write!(f, "{error}") + } + ErrorKind::NotImplemented(feature) => { write!(f, "feature not yet implemented in Tvix: {}", feature) } @@ -583,6 +607,7 @@ impl Error { | ErrorKind::ReadFileError { .. } | ErrorKind::ImportParseError { .. } | ErrorKind::ImportCompilerError { .. } + | ErrorKind::IO { .. } | ErrorKind::NotImplemented(_) => return None, }; @@ -620,6 +645,7 @@ impl Error { ErrorKind::ReadFileError { .. } => "E026", ErrorKind::ImportParseError { .. } => "E027", ErrorKind::ImportCompilerError { .. } => "E028", + ErrorKind::IO { .. } => "E029", // Placeholder error while Tvix is under construction. ErrorKind::NotImplemented(_) => "E999", |