cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Improve EvalState::require_attrs_select error message

Browse source 
(cherry picked from commit 220b6f4123966d818064f4114477ce8676214b90)
This commit is contained in:
Robert Hensing 2025-01-31 07:38:11 +01:00
parent 895336ac79
commit 2508facd82
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rust/nix-expr/src/eval_state.rs
View file

@ -268,8 +268,21 @@ impl EvalState {
v.raw_ptr(),
self.eval_state.as_ptr(),
attr_name.as_ptr()
))?;
Ok(Value::new(v2))
));
match v2 {
Ok(v2) => Ok(Value::new(v2)),
Err(e) => {
// As of Nix 2.26, the error message is not helpful when it
// is simply missing, so we provide a better one. (Note that
// missing attributes requested by Nix expressions OTOH is a
// different error message which works fine.)
if e.to_string() == "missing attribute" {
bail!("attribute `{}` not found", attr_name.to_string_lossy());
} else {
Err(e)
}
}
}
}
}
@ -896,8 +909,7 @@ mod tests {
Ok(_) => panic!("expected an error"),
Err(e) => {
let s = format!("{e:#}");
// TODO: bad error message from Nix
if !s.contains("missing attribute") {
if !s.contains("attribute `c` not found") {
eprintln!("unexpected error message: {}", s);
assert!(false);
}