mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/glue): Make a single errors.rs module

Browse source 
To pave the way for adding a new error type for builtins in this crate,
move DerivationError to a new builtins::errors module.

Change-Id: I65fcad63e43ed40ad39c2c6540a2ab80fdd90fd4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11016
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: aspen <root@gws.fyi>
This commit is contained in:
Aspen Smith 2024-02-22 16:09:28 -05:00 committed by clbot
parent 782cfa9e33
commit ffb134398d
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tvix/glue/src/builtins/derivation_error.rs → tvix/glue/src/builtins/errors.rs
View file

@ -1,11 +1,11 @@
//! Contains [crate::builtins::DerivationError]. //! Contains errors that can occur during evaluation of builtins in this crate
use nix_compat::{derivation::DerivationError, nixhash}; use nix_compat::nixhash;
use std::rc::Rc; use std::rc::Rc;
use thiserror::Error; use thiserror::Error;
/// Errors related to derivation construction /// Errors related to derivation construction
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum Error { pub enum DerivationError {
#[error("an output with the name '{0}' is already defined")] #[error("an output with the name '{0}' is already defined")]
DuplicateOutput(String), DuplicateOutput(String),
#[error("fixed-output derivations can only have the default `out`-output")] #[error("fixed-output derivations can only have the default `out`-output")]
@ -13,15 +13,15 @@ pub enum Error {
#[error("the environment variable '{0}' has already been set in this derivation")] #[error("the environment variable '{0}' has already been set in this derivation")]
DuplicateEnvVar(String), DuplicateEnvVar(String),
#[error("invalid derivation parameters: {0}")] #[error("invalid derivation parameters: {0}")]
InvalidDerivation(DerivationError), InvalidDerivation(#[from] nix_compat::derivation::DerivationError),
#[error("invalid output hash: {0}")] #[error("invalid output hash: {0}")]
InvalidOutputHash(nixhash::Error), InvalidOutputHash(#[from] nixhash::Error),
#[error("invalid output hash mode: '{0}', only 'recursive' and 'flat` are supported")] #[error("invalid output hash mode: '{0}', only 'recursive' and 'flat` are supported")]
InvalidOutputHashMode(String), InvalidOutputHashMode(String),
} }
impl From<Error> for tvix_eval::ErrorKind { impl From<DerivationError> for tvix_eval::ErrorKind {
fn from(err: Error) -> Self { fn from(err: DerivationError) -> Self {
tvix_eval::ErrorKind::TvixError(Rc::new(err)) tvix_eval::ErrorKind::TvixError(Rc::new(err))
} }
} }

5
tvix/glue/src/builtins/mod.rs
View file

@ -5,12 +5,11 @@ use std::rc::Rc;
use crate::tvix_store_io::TvixStoreIO; use crate::tvix_store_io::TvixStoreIO;
mod derivation; mod derivation;
mod derivation_error; mod errors;
mod fetchers; mod fetchers;
mod import; mod import;
pub use derivation_error::Error as DerivationError; pub use errors::DerivationError;
/// Adds derivation-related builtins to the passed [tvix_eval::Evaluation]. /// Adds derivation-related builtins to the passed [tvix_eval::Evaluation].
/// ///