Make Span mandatory for some fields in ShellError (#16471)

Some variants of `ShellError` have `Option<Span>` that really don't need
to. This PR removes the `Option` for `ConfigDirNotFound`
and `DisabledOsSupport`.

Also removes `ShellError::InterruptedByUser`, which had exactly one
usage, in favor of the more widely used `ShellError::Interrupted`

Rel: #13005

## Release notes summary - What our users need to know
N/A

crates/nu-cli/src/commands/history/history_.rs

@@ -49,7 +49,7 @@ impl Command for History {
         };
         // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
         let Some(history_path) = history.file_path() else {
-            return Err(ShellError::ConfigDirNotFound { span: Some(head) });
+            return Err(ShellError::ConfigDirNotFound { span: head });
         };
 
         if call.has_flag(engine_state, stack, "clear")? {

crates/nu-cli/src/commands/history/history_import.rs

@@ -78,7 +78,7 @@ Note that history item IDs are ignored when importing from file."#
             return ok;
         };
         let Some(current_history_path) = history.file_path() else {
-            return Err(ShellError::ConfigDirNotFound { span: span.into() });
+            return Err(ShellError::ConfigDirNotFound { span });
         };
         if let Some(bak_path) = backup(&current_history_path, span)? {
             println!("Backed history to {}", bak_path.display());
@@ -89,8 +89,9 @@ Note that history item IDs are ignored when importing from file."#
                     HistoryFileFormat::Sqlite => HistoryFileFormat::Plaintext,
                     HistoryFileFormat::Plaintext => HistoryFileFormat::Sqlite,
                 };
-                let src = new_backend(other_format, None)?;
+                let src = new_backend(other_format, None, call.head)?;
-                let mut dst = new_backend(history.file_format, Some(current_history_path))?;
+                let mut dst =
+                    new_backend(history.file_format, Some(current_history_path), call.head)?;
                 let items = src
                     .search(SearchQuery::everything(
                         reedline::SearchDirection::Forward,
@@ -104,7 +105,8 @@ Note that history item IDs are ignored when importing from file."#
             _ => {
                 let input = input.into_iter().map(item_from_value);
                 import(
-                    new_backend(history.file_format, Some(current_history_path))?.as_mut(),
+                    new_backend(history.file_format, Some(current_history_path), call.head)?
+                        .as_mut(),
                     input,
                 )
             }
@@ -117,12 +119,13 @@ Note that history item IDs are ignored when importing from file."#
 fn new_backend(
     format: HistoryFileFormat,
     path: Option<PathBuf>,
+    span: Span,
 ) -> Result<Box<dyn History>, ShellError> {
     let path = match path {
         Some(path) => path,
         None => {
             let Some(mut path) = nu_path::nu_config_dir() else {
-                return Err(ShellError::ConfigDirNotFound { span: None });
+                return Err(ShellError::ConfigDirNotFound { span });
             };
             path.push(format.default_file_name());
             path.into_std_path_buf()

crates/nu-cmd-lang/src/core_commands/do_.rs

@@ -83,7 +83,7 @@ impl Command for Do {
                 #[cfg(not(feature = "os"))]
                 return Err(ShellError::DisabledOsSupport {
                     msg: "Cannot create a thread to receive stdout message.".to_string(),
-                    span: Some(span),
+                    span,
                 });
 
                 #[cfg(feature = "os")]

crates/nu-command/src/env/config/config_.rs

@@ -52,7 +52,7 @@ pub(super) fn start_editor(
 ) -> Result<PipelineData, ShellError> {
     Err(ShellError::DisabledOsSupport {
         msg: "Running external commands is not available without OS support.".to_string(),
-        span: Some(call.head),
+        span: call.head,
     })
 }
 

crates/nu-command/src/env/config/config_reset.rs

@@ -45,7 +45,7 @@ impl Command for ConfigReset {
         let no_backup = call.has_flag(engine_state, stack, "without-backup")?;
         let span = call.head;
         let Some(config_path) = nu_path::nu_config_dir() else {
-            return Err(ShellError::ConfigDirNotFound { span: None });
+            return Err(ShellError::ConfigDirNotFound { span: call.head });
         };
         if !only_env {
             let mut nu_config = config_path.clone();

crates/nu-command/src/platform/term/term_query.rs

@@ -152,9 +152,7 @@ The `prefix` is not included in the output."
                     .map_err(|err| IoError::new(err, call.head, None))?;
 
                 if b[0] == CTRL_C {
-                    return Err(ShellError::InterruptedByUser {
+                    return Err(ShellError::Interrupted { span: call.head });
-                        span: Some(call.head),
-                    });
                 }
 
                 buf.push(b[0]);

crates/nu-protocol/src/errors/shell_error/mod.rs

@@ -1114,13 +1114,6 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// Operation interrupted by user
-    #[error("Operation interrupted by user")]
-    InterruptedByUser {
-        #[label("This operation was interrupted")]
-        span: Option<Span>,
-    },
-
     /// An attempt to use, as a match guard, an expression that
     /// does not resolve into a boolean
     #[error("Match guard not bool")]
@@ -1338,7 +1331,7 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
     )]
     ConfigDirNotFound {
         #[label = "Could not find config directory"]
-        span: Option<Span>,
+        span: Span,
     },
 
     /// XDG_CONFIG_HOME was set to an invalid path
@@ -1378,7 +1371,7 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
     DisabledOsSupport {
         msg: String,
         #[label = "while running this code"]
-        span: Option<Span>,
+        span: Span,
     },
 
     #[error(transparent)]

crates/nu-protocol/src/eval_const.rs

@@ -38,10 +38,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
 
     let config_path = match nu_path::nu_config_dir() {
         Some(path) => Ok(canonicalize_path(engine_state, path.as_ref())),
-        None => Err(Value::error(
+        None => Err(Value::error(ShellError::ConfigDirNotFound { span }, span)),
-            ShellError::ConfigDirNotFound { span: Some(span) },
-            span,
-        )),
     };
 
     record.push(

crates/nu-protocol/src/pipeline/byte_stream.rs

@@ -381,7 +381,7 @@ impl ByteStream {
     pub fn stdin(span: Span) -> Result<Self, ShellError> {
         Err(ShellError::DisabledOsSupport {
             msg: "Stdin is not supported".to_string(),
-            span: Some(span),
+            span,
         })
     }