holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relax panic into error

Browse Source 
Convert the panic when declaration cannot find predeclaration into an
error. This error is already covered and reported in the predeclaration
phase.
This commit is contained in:
Jakub Žádník 2021-10-02 03:42:35 +03:00
parent 2c1b074bdc
commit 6595c06598
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-parser/src/parse_keywords.rs
View File

@ -101,15 +101,20 @@ pub fn parse_def(
if let (Some(name), Some(mut signature), Some(block_id)) =
(&name, signature, block_id)
{
let decl_id = working_set
.find_decl(name.as_bytes())
.expect("internal error: predeclaration failed to add definition");
if let Some(decl_id) = working_set.find_decl(name.as_bytes()) {
let declaration = working_set.get_decl_mut(decl_id);
let declaration = working_set.get_decl_mut(decl_id);
signature.name = name.clone();
signature.name = name.clone();
*declaration = signature.into_block_command(block_id);
*declaration = signature.into_block_command(block_id);
} else {
error = error.or_else(|| {
Some(ParseError::UnknownState(
"Could not define hidden command".into(),
spans[1],
))
});
};
}
} else {
let err_span = Span {