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

Fix issues with error make refactor (#10950)

Browse Source 
- Replaced one error return `None` with a `help` option.
- Fixed example.
- Added comments highlighting correct early returns.

Fix #10947
This commit is contained in:
Andrej Kolchin 2023-11-04 16:23:43 +00:00 committed by GitHub
parent 1a864ea6f4
commit f565661f42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-cmd-lang/src/core_commands/error_make.rs
View File

@ -83,8 +83,8 @@ impl Command for ErrorMake {
start: 123
end: 456
}
help: "A help string, suggesting a fix to the user" # optional
}
help: "A help string, suggesting a fix to the user" # optional
}"#,
result: Some(Value::error(
ShellError::GenericError(
@ -160,6 +160,7 @@ fn make_other_error(value: &Value, throw_span: Option<Span>) -> ShellError {
let label = match value.get_data_by_key("label") {
Some(value) => value,
// correct return: no label
None => {
return ShellError::GenericError(
msg,
@ -215,7 +216,8 @@ fn make_other_error(value: &Value, throw_span: Option<Span>) -> ShellError {
Vec::new(),
)
}
None => return ShellError::GenericError(msg, text, throw_span, None, Vec::new()),
// correct return: label, no span
None => return ShellError::GenericError(msg, text, throw_span, help, Vec::new()),
};
let span_start = match get_span_sides(&span, "start") {
@ -237,6 +239,7 @@ fn make_other_error(value: &Value, throw_span: Option<Span>) -> ShellError {
);
}
// correct return: everything present
ShellError::GenericError(
msg,
text,