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

feat(tvix/eval): add ErrorKind::UnexpectedArgumentBuiltin

Browse source 
Change-Id: Ieb091b32aad566719fbe8604c4a589f5ccaaf6b3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11877
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2024-06-25 22:56:28 +03:00 committed by flokli
parent 970e2a045b
commit a0993e7304
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tvix/eval/src/errors.rs
View file

@ -184,6 +184,9 @@ pub enum ErrorKind {
/// Errors converting TOML to a value /// Errors converting TOML to a value
FromTomlError(String), FromTomlError(String),
/// An unexpected argument was supplied to a builtin
UnexpectedArgumentBuiltin(NixString),
/// An unexpected argument was supplied to a function that takes formal parameters /// An unexpected argument was supplied to a function that takes formal parameters
UnexpectedArgumentFormals { UnexpectedArgumentFormals {
arg: NixString, arg: NixString,
@ -487,6 +490,10 @@ to a missing value in the attribute set(s) included via `with`."#,
write!(f, "Error converting TOML to a Nix value: {msg}") write!(f, "Error converting TOML to a Nix value: {msg}")
} }
ErrorKind::UnexpectedArgumentBuiltin(arg) => {
write!(f, "Unexpected agrument `{arg}` passed to builtin",)
}
ErrorKind::UnexpectedArgumentFormals { arg, .. } => { ErrorKind::UnexpectedArgumentFormals { arg, .. } => {
write!(f, "Unexpected argument `{arg}` supplied to function",) write!(f, "Unexpected argument `{arg}` supplied to function",)
} }
@ -778,6 +785,7 @@ impl Error {
ErrorKind::DuplicateAttrsKey { .. } => "in this attribute set", ErrorKind::DuplicateAttrsKey { .. } => "in this attribute set",
ErrorKind::InvalidAttributeName(_) => "in this attribute set", ErrorKind::InvalidAttributeName(_) => "in this attribute set",
ErrorKind::RelativePathResolution(_) => "in this path literal", ErrorKind::RelativePathResolution(_) => "in this path literal",
ErrorKind::UnexpectedArgumentBuiltin { .. } => "while calling this builtin",
ErrorKind::UnexpectedArgumentFormals { .. } => "in this function call", ErrorKind::UnexpectedArgumentFormals { .. } => "in this function call",
ErrorKind::UnexpectedContext => "in this string", ErrorKind::UnexpectedContext => "in this string",
@ -861,6 +869,7 @@ impl Error {
ErrorKind::UnexpectedContext => "E037", ErrorKind::UnexpectedContext => "E037",
ErrorKind::Utf8 => "E038", ErrorKind::Utf8 => "E038",
ErrorKind::UnknownHashType(_) => "E039", ErrorKind::UnknownHashType(_) => "E039",
ErrorKind::UnexpectedArgumentBuiltin { .. } => "E040",
// Special error code for errors from other Tvix // Special error code for errors from other Tvix
// components. We may want to introduce a code namespacing // components. We may want to introduce a code namespacing