From f565661f42ee2fa7fa57d4d84efdf5be893a61ce Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Sat, 4 Nov 2023 16:23:43 +0000
Subject: [PATCH] Fix issues with `error make` refactor (#10950)

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

Fix #10947
---
 crates/nu-cmd-lang/src/core_commands/error_make.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/error_make.rs b/crates/nu-cmd-lang/src/core_commands/error_make.rs
index e67b41445d..e28d99e120 100644
--- a/crates/nu-cmd-lang/src/core_commands/error_make.rs
+++ b/crates/nu-cmd-lang/src/core_commands/error_make.rs
@@ -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,