Spanned Value step 1: span all value cases

crates/nu-cli/src/commands/commandline.rs

@@ -84,7 +84,7 @@ impl Command for Commandline {
                         return Err(ShellError::CantConvert {
                             to_type: "int".to_string(),
                             from_type: "string".to_string(),
-                            span: cmd.span()?,
+                            span: cmd.span(),
                             help: Some(format!(
                                 r#"string "{cmd_str}" does not represent a valid integer"#
                             )),

crates/nu-cli/src/eval_file.rs

@@ -185,7 +185,7 @@ pub(crate) fn print_table_or_error(
     // Change the engine_state config to use the passed in configuration
     engine_state.set_config(config);
 
-    if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data {
+    if let PipelineData::Value(Value::Error { error, .. }, ..) = &pipeline_data {
         let working_set = StateWorkingSet::new(engine_state);
         report_error(&working_set, &**error);
         std::process::exit(1);
@@ -232,7 +232,7 @@ pub(crate) fn print_table_or_error(
 
 fn print_or_exit(pipeline_data: PipelineData, engine_state: &mut EngineState, config: &Config) {
     for item in pipeline_data {
-        if let Value::Error { error } = item {
+        if let Value::Error { error, .. } = item {
             let working_set = StateWorkingSet::new(engine_state);
 
             report_error(&working_set, &*error);

crates/nu-cli/src/nu_highlight.rs

@@ -55,6 +55,7 @@ impl Command for NuHighlight {
                 }
                 Err(err) => Value::Error {
                     error: Box::new(err),
+                    span: head,
                 },
             },
             ctrlc,

crates/nu-cli/src/reedline_config.rs

@@ -141,14 +141,14 @@ fn add_menu(
             _ => Err(ShellError::UnsupportedConfigValue(
                 "columnar, list or description".to_string(),
                 menu.menu_type.into_abbreviated_string(config),
-                menu.menu_type.span()?,
+                menu.menu_type.span(),
             )),
         }
     } else {
         Err(ShellError::UnsupportedConfigValue(
             "only record type".to_string(),
             menu.menu_type.into_abbreviated_string(config),
-            menu.menu_type.span()?,
+            menu.menu_type.span(),
         ))
     }
 }
@@ -264,7 +264,7 @@ pub(crate) fn add_columnar_menu(
         _ => Err(ShellError::UnsupportedConfigValue(
             "block or omitted value".to_string(),
             menu.source.into_abbreviated_string(config),
-            menu.source.span()?,
+            menu.source.span(),
         )),
     }
 }
@@ -347,7 +347,7 @@ pub(crate) fn add_list_menu(
         _ => Err(ShellError::UnsupportedConfigValue(
             "block or omitted value".to_string(),
             menu.source.into_abbreviated_string(config),
-            menu.source.span()?,
+            menu.source.span(),
         )),
     }
 }
@@ -466,7 +466,7 @@ pub(crate) fn add_description_menu(
         _ => Err(ShellError::UnsupportedConfigValue(
             "closure or omitted value".to_string(),
             menu.source.into_abbreviated_string(config),
-            menu.source.span()?,
+            menu.source.span(),
         )),
     }
 }
@@ -603,7 +603,7 @@ fn add_keybinding(
         v => Err(ShellError::UnsupportedConfigValue(
             "string or list of strings".to_string(),
             v.into_abbreviated_string(config),
-            v.span()?,
+            v.span(),
         )),
     }
 }
@@ -633,7 +633,7 @@ fn add_parsed_keybinding(
             return Err(ShellError::UnsupportedConfigValue(
                 "CONTROL, SHIFT, ALT or NONE".to_string(),
                 keybinding.modifier.into_abbreviated_string(config),
-                keybinding.modifier.span()?,
+                keybinding.modifier.span(),
             ))
         }
     };
@@ -657,7 +657,7 @@ fn add_parsed_keybinding(
                 return Err(ShellError::UnsupportedConfigValue(
                     "char_<CHAR: unicode codepoint>".to_string(),
                     c.to_string(),
-                    keybinding.keycode.span()?,
+                    keybinding.keycode.span(),
                 ));
             };
 
@@ -684,7 +684,7 @@ fn add_parsed_keybinding(
                 .ok_or(ShellError::UnsupportedConfigValue(
                     "(f1|f2|...|f20)".to_string(),
                     format!("unknown function key: {c}"),
-                    keybinding.keycode.span()?,
+                    keybinding.keycode.span(),
                 ))?;
             KeyCode::F(fn_num)
         }
@@ -694,7 +694,7 @@ fn add_parsed_keybinding(
             return Err(ShellError::UnsupportedConfigValue(
                 "crossterm KeyCode".to_string(),
                 keybinding.keycode.into_abbreviated_string(config),
-                keybinding.keycode.span()?,
+                keybinding.keycode.span(),
             ))
         }
     };
@@ -751,7 +751,7 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                                 None => Err(ShellError::UnsupportedConfigValue(
                                     "List containing valid events".to_string(),
                                     "Nothing value (null)".to_string(),
-                                    value.span()?,
+                                    value.span(),
                                 )),
                                 Some(event) => Ok(event),
                             },
@@ -764,7 +764,7 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                 v => Err(ShellError::UnsupportedConfigValue(
                     "list of events".to_string(),
                     v.into_abbreviated_string(config),
-                    v.span()?,
+                    v.span(),
                 )),
             },
         },
@@ -776,7 +776,7 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                         None => Err(ShellError::UnsupportedConfigValue(
                             "List containing valid events".to_string(),
                             "Nothing value (null)".to_string(),
-                            value.span()?,
+                            value.span(),
                         )),
                         Some(event) => Ok(event),
                     },
@@ -790,7 +790,7 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
         v => Err(ShellError::UnsupportedConfigValue(
             "record or list of records, null to unbind key".to_string(),
             v.into_abbreviated_string(config),
-            v.span()?,
+            v.span(),
         )),
     }
 }
@@ -965,7 +965,7 @@ fn edit_from_record(
 }
 
 fn extract_char(value: &Value, config: &Config) -> Result<char, ShellError> {
-    let span = value.span()?;
+    let span = value.span();
     value
         .into_string("", config)
         .chars()

crates/nu-cmd-base/src/input_handler.rs

@@ -78,6 +78,7 @@ where
                         if let Err(error) = r {
                             return Value::Error {
                                 error: Box::new(error),
+                                span,
                             };
                         }
                     }

crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs

@@ -92,7 +92,7 @@ fn command_eager(
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let mask_value: Value = call.req(engine_state, stack, 0)?;
-    let mask_span = mask_value.span()?;
+    let mask_span = mask_value.span();
 
     if NuExpression::can_downcast(&mask_value) {
         let expression = NuExpression::try_from_value(mask_value)?;

crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs

@@ -160,7 +160,7 @@ fn command_lazy(
         let value: Value = call.req(engine_state, stack, 1)?;
         return Err(ShellError::IncompatibleParametersSingle {
             msg: "New name list has different size to column list".into(),
-            span: value.span()?,
+            span: value.span(),
         });
     }
 

crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs

@@ -134,16 +134,17 @@ fn command(
                         ))
                     }
                 }
-                _ => match value.span() {
-                    Ok(span) => Err(ShellError::GenericError(
+                Value::Error { error, .. } => Err(*error.clone()),
+                _ => {
+                    let span = value.span();
+                    Err(ShellError::GenericError(
                         "Incorrect value for quantile".to_string(),
                         "value should be a float".to_string(),
                         Some(span),
                         None,
                         Vec::new(),
-                    )),
-                    Err(e) => Err(e),
-                },
+                    ))
+                }
             })
             .collect::<Result<Vec<f64>, ShellError>>()
     });

crates/nu-cmd-dataframe/src/dataframe/eager/take.rs

@@ -93,7 +93,7 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let index_value: Value = call.req(engine_state, stack, 0)?;
-    let index_span = index_value.span()?;
+    let index_span = index_value.span();
     let index = NuDataFrame::try_from_value(index_value)?.as_series(index_span)?;
 
     let casted = match index.dtype() {

crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs

@@ -114,7 +114,7 @@ impl Command for WithColumn {
             Err(ShellError::CantConvert {
                 to_type: "lazy or eager dataframe".into(),
                 from_type: value.get_type().to_string(),
-                span: value.span()?,
+                span: value.span(),
                 help: None,
             })
         }
@@ -128,7 +128,7 @@ fn command_eager(
     mut df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let new_column: Value = call.req(engine_state, stack, 0)?;
-    let column_span = new_column.span()?;
+    let column_span = new_column.span();
 
     if NuExpression::can_downcast(&new_column) {
         let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;

crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs

@@ -93,7 +93,7 @@ impl Command for LazyFillNA {
                 None,
             ))
         } else {
-            let val_span = value.span()?;
+            let val_span = value.span();
             let frame = NuDataFrame::try_from_value(value)?;
             let columns = frame.columns(val_span)?;
             let dataframe = columns

crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs

@@ -126,7 +126,7 @@ impl Command for ToLazyGroupBy {
             let value: Value = call.req(engine_state, stack, 0)?;
             return Err(ShellError::IncompatibleParametersSingle {
                 msg: "Expected only Col expressions".into(),
-                span: value.span()?,
+                span: value.span(),
             });
         }
 

crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs

@@ -199,7 +199,7 @@ impl Command for LazyJoin {
             let right_on: Value = call.req(engine_state, stack, 2)?;
             return Err(ShellError::IncompatibleParametersSingle {
                 msg: "The right column list has a different size to the left column list".into(),
-                span: right_on.span()?,
+                span: right_on.span(),
             });
         }
 
@@ -209,7 +209,7 @@ impl Command for LazyJoin {
                 let value: Value = call.req(engine_state, stack, *index)?;
                 return Err(ShellError::IncompatibleParametersSingle {
                     msg: "Expected only a string, col expressions or list of strings".into(),
-                    span: value.span()?,
+                    span: value.span(),
                 });
             }
         }

crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs

@@ -118,7 +118,7 @@ impl Command for LazySortBy {
                     let span = call
                         .get_flag::<Value>(engine_state, stack, "reverse")?
                         .expect("already checked and it exists")
-                        .span()?;
+                        .span();
                     return Err(ShellError::GenericError(
                         "Incorrect list size".into(),
                         "Size doesn't match expression list".into(),

crates/nu-cmd-dataframe/src/dataframe/series/indexes/set_with_idx.rs

@@ -82,7 +82,7 @@ fn command(
     let indices_value: Value = call
         .get_flag(engine_state, stack, "indices")?
         .expect("required named value");
-    let indices_span = indices_value.span()?;
+    let indices_span = indices_value.span();
     let indices = NuDataFrame::try_from_value(indices_value)?.as_series(indices_span)?;
 
     let casted = match indices.dtype() {
@@ -204,7 +204,7 @@ fn command(
                 "this value cannot be set in a series of type '{}'",
                 series.dtype()
             ),
-            Some(value.span()?),
+            Some(value.span()),
             None,
             Vec::new(),
         )),

crates/nu-cmd-dataframe/src/dataframe/series/masks/is_in.rs

@@ -74,7 +74,7 @@ fn command(
     let df = NuDataFrame::try_from_pipeline(input, call.head)?;
 
     let other_value: Value = call.req(engine_state, stack, 0)?;
-    let other_span = other_value.span()?;
+    let other_span = other_value.span();
     let other_df = NuDataFrame::try_from_value(other_value)?;
     let other = other_df.as_series(other_span)?;
 

crates/nu-cmd-dataframe/src/dataframe/series/masks/set.rs

@@ -81,7 +81,7 @@ fn command(
     let mask_value: Value = call
         .get_flag(engine_state, stack, "mask")?
         .expect("required named value");
-    let mask_span = mask_value.span()?;
+    let mask_span = mask_value.span();
     let mask = NuDataFrame::try_from_value(mask_value)?.as_series(mask_span)?;
 
     let bool_mask = match mask.dtype() {
@@ -185,7 +185,7 @@ fn command(
                 "this value cannot be set in a series of type '{}'",
                 series.dtype()
             ),
-            Some(value.span()?),
+            Some(value.span()),
             None,
             Vec::new(),
         )),

crates/nu-cmd-dataframe/src/dataframe/series/string/concatenate.rs

@@ -74,7 +74,7 @@ fn command(
     let df = NuDataFrame::try_from_pipeline(input, call.head)?;
 
     let other: Value = call.req(engine_state, stack, 0)?;
-    let other_span = other.span()?;
+    let other_span = other.span();
     let other_df = NuDataFrame::try_from_value(other)?;
 
     let other_series = other_df.as_series(other_span)?;

crates/nu-cmd-dataframe/src/dataframe/utils.rs

@@ -9,7 +9,7 @@ pub fn extract_strings(value: Value) -> Result<Vec<String>, ShellError> {
         (Err(_), Ok(cols)) => Ok(cols),
         _ => Err(ShellError::IncompatibleParametersSingle {
             msg: "Expected a string or list of strings".into(),
-            span: value.span()?,
+            span: value.span(),
         }),
     }
 }