forked from extern/nushell
Convert ShellError::AliasNotFound to named fields (#11118)
# Description Part of #10700 # User-Facing Changes None # Tests + Formatting - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # After Submitting N/A
This commit is contained in:
parent
1b54dd5418
commit
0578cf85ac
@ -89,7 +89,7 @@ You can also learn more at https://www.nushell.sh/book/"#;
|
||||
} else {
|
||||
let result = help_aliases(engine_state, stack, call);
|
||||
|
||||
let result = if let Err(ShellError::AliasNotFound(_)) = result {
|
||||
let result = if let Err(ShellError::AliasNotFound { .. }) = result {
|
||||
help_commands(engine_state, stack, call)
|
||||
} else {
|
||||
result
|
||||
|
@ -119,15 +119,15 @@ pub fn help_aliases(
|
||||
}
|
||||
|
||||
let Some(alias) = engine_state.find_decl(name.as_bytes(), &[]) else {
|
||||
return Err(ShellError::AliasNotFound(span(
|
||||
&rest.iter().map(|r| r.span).collect::<Vec<Span>>(),
|
||||
)));
|
||||
return Err(ShellError::AliasNotFound {
|
||||
span: span(&rest.iter().map(|r| r.span).collect::<Vec<Span>>()),
|
||||
});
|
||||
};
|
||||
|
||||
let Some(alias) = engine_state.get_decl(alias).as_alias() else {
|
||||
return Err(ShellError::AliasNotFound(span(
|
||||
&rest.iter().map(|r| r.span).collect::<Vec<Span>>(),
|
||||
)));
|
||||
return Err(ShellError::AliasNotFound {
|
||||
span: span(&rest.iter().map(|r| r.span).collect::<Vec<Span>>()),
|
||||
});
|
||||
};
|
||||
|
||||
let alias_expansion =
|
||||
|
@ -701,7 +701,10 @@ pub enum ShellError {
|
||||
/// The alias does not exist in the current scope. It might exist in another scope or overlay or be hidden.
|
||||
#[error("Alias not found")]
|
||||
#[diagnostic(code(nu::shell::alias_not_found))]
|
||||
AliasNotFound(#[label("alias not found")] Span),
|
||||
AliasNotFound {
|
||||
#[label("alias not found")]
|
||||
span: Span,
|
||||
},
|
||||
|
||||
/// Failed to find a file during a nushell operation.
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user