Remove all usages of internal_span (nushell#16799)

132ikl · web-flow · commit c4eca641f106 · 2025-10-07T18:19:26.000+03:00
This PR removes all usages of `internal_span`. Hooray! It also upgrades the `ast-grep` for `internal_span` from a warning to an error, so we can prevent accidentally reintroducing `internal_span` Related: nushell#12963
diff --git a/ast-grep/rules/internal_span.yml b/ast-grep/rules/internal_span.yml
@@ -2,7 +2,7 @@
 
 id: internal_span
 language: rust
-severity: warning
+severity: error
 message: "Using `internal_span` directly is deprecated."
 note: "You can get the span using the `Value::span()` method."
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@@ -114,19 +114,16 @@ impl Command for UpdateCells {
 
         let metadata = input.metadata();
 
+        let span = input.span();
         match input {
-            PipelineData::Value(
-                Value::Record {
-                    ref mut val,
-                    internal_span,
-                },
-                ..,
-            ) => {
+            PipelineData::Value(Value::Record { ref mut val, .. }, ..) => {
+                // SAFETY: we have a value in the input, so we must have a span
+                let span = span.expect("value had no span");
                 let val = val.to_mut();
                 update_record(
                     val,
                     &mut ClosureEval::new(engine_state, stack, closure),
-                    internal_span,
+                    span,
                     columns.as_ref(),
                 );
                 Ok(input)
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
@@ -81,11 +81,10 @@ impl Command for IntoValue {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        if let PipelineData::Value(Value::Custom { val, internal_span }, metadata) = input {
-            return Ok(PipelineData::value(
-                val.to_base_value(internal_span)?,
-                metadata,
-            ));
+        if let PipelineData::Value(v @ Value::Custom { .. }, metadata) = input {
+            let span = v.span();
+            let val = v.into_custom_value()?;
+            return Ok(PipelineData::value(val.to_base_value(span)?, metadata));
         }
 
         if let Some(block_id) = DEPRECATED_REDIRECT_BLOCK_ID.get() {
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
@@ -233,14 +233,16 @@ impl Command for Save {
                 };
 
                 // Save custom value however they implement saving
-                if let PipelineData::Value(Value::Custom { val, internal_span }, ..) = converted {
+                if let PipelineData::Value(v @ Value::Custom { .. }, ..) = converted {
+                    let val_span = v.span();
+                    let val = v.into_custom_value()?;
                     return val
                         .save(
                             Spanned {
                                 item: &path.item,
                                 span: path.span,
                             },
-                            internal_span,
+                            val_span,
                             span,
                         )
                         .map(|()| PipelineData::empty());
diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs
@@ -200,21 +200,24 @@ impl Command for SeqDate {
         let end_date: Option<Spanned<String>> = call.get_flag(engine_state, stack, "end-date")?;
 
         let increment = match call.get_flag::<Value>(engine_state, stack, "increment")? {
-            Some(increment) => match increment {
-                Value::Int { val, internal_span } => Some(
-                    val.checked_mul(NANOSECONDS_IN_DAY)
-                        .ok_or_else(|| ShellError::GenericError {
-                            error: "increment is too large".into(),
-                            msg: "increment is too large".into(),
-                            span: Some(internal_span),
-                            help: None,
-                            inner: vec![],
-                        })?
-                        .into_spanned(internal_span),
-                ),
-                Value::Duration { val, internal_span } => Some(val.into_spanned(internal_span)),
-                _ => None,
-            },
+            Some(increment) => {
+                let span = increment.span();
+                match increment {
+                    Value::Int { val, .. } => Some(
+                        val.checked_mul(NANOSECONDS_IN_DAY)
+                            .ok_or_else(|| ShellError::GenericError {
+                                error: "increment is too large".into(),
+                                msg: "increment is too large".into(),
+                                span: Some(span),
+                                help: None,
+                                inner: vec![],
+                            })?
+                            .into_spanned(span),
+                    ),
+                    Value::Duration { val, .. } => Some(val.into_spanned(span)),
+                    _ => None,
+                }
+            }
             None => None,
         };
 
diff --git a/crates/nu-command/src/math/abs.rs b/crates/nu-command/src/math/abs.rs
@@ -48,15 +48,9 @@ impl Command for MathAbs {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(move |value| abs_helper(value, head), engine_state.signals())
     }
@@ -68,15 +62,9 @@ impl Command for MathAbs {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| abs_helper(value, head),
diff --git a/crates/nu-command/src/math/ceil.rs b/crates/nu-command/src/math/ceil.rs
@@ -47,15 +47,9 @@ impl Command for MathCeil {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(move |value| operate(value, head), engine_state.signals())
     }
@@ -71,15 +65,9 @@ impl Command for MathCeil {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| operate(value, head),
diff --git a/crates/nu-command/src/math/floor.rs b/crates/nu-command/src/math/floor.rs
@@ -65,15 +65,9 @@ impl Command for MathFloor {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| operate(value, head),
diff --git a/crates/nu-command/src/math/log.rs b/crates/nu-command/src/math/log.rs
@@ -50,15 +50,9 @@ impl Command for MathLog {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let base: Spanned<f64> = call.req(engine_state, stack, 0)?;
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         log(base, call.head, input, engine_state.signals())
     }
@@ -71,15 +65,9 @@ impl Command for MathLog {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let base: Spanned<f64> = call.req_const(working_set, 0)?;
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         log(base, call.head, input, working_set.permanent().signals())
     }
diff --git a/crates/nu-command/src/math/round.rs b/crates/nu-command/src/math/round.rs
@@ -54,15 +54,9 @@ impl Command for MathRound {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| operate(value, head, precision_param),
@@ -82,15 +76,9 @@ impl Command for MathRound {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| operate(value, head, precision_param),
diff --git a/crates/nu-command/src/math/sqrt.rs b/crates/nu-command/src/math/sqrt.rs
@@ -47,15 +47,9 @@ impl Command for MathSqrt {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(move |value| operate(value, head), engine_state.signals())
     }
@@ -71,15 +65,9 @@ impl Command for MathSqrt {
         if let PipelineData::Empty = input {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        if let PipelineData::Value(
-            Value::Range {
-                ref val,
-                internal_span,
-            },
-            ..,
-        ) = input
-        {
-            ensure_bounded(val.as_ref(), internal_span, head)?;
+        if let PipelineData::Value(ref v @ Value::Range { ref val, .. }, ..) = input {
+            let span = v.span();
+            ensure_bounded(val, span, head)?;
         }
         input.map(
             move |value| operate(value, head),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
@@ -279,16 +279,20 @@ fn command(
     };
 
     let ambiguous = match call.get_flag::<Value>("ambiguous")? {
-        Some(Value::String { val, internal_span }) => match val.as_str() {
-            "raise" | "earliest" | "latest" => Ok(val),
-            _ => Err(ShellError::GenericError {
-                error: "Invalid argument value".into(),
-                msg: "`ambiguous` must be one of raise, earliest, latest, or null".into(),
-                span: Some(internal_span),
-                help: None,
-                inner: vec![],
-            }),
-        },
+        Some(v @ Value::String { .. }) => {
+            let span = v.span();
+            let val = v.into_string()?;
+            match val.as_str() {
+                "raise" | "earliest" | "latest" => Ok(val),
+                _ => Err(ShellError::GenericError {
+                    error: "Invalid argument value".into(),
+                    msg: "`ambiguous` must be one of raise, earliest, latest, or null".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                }),
+            }
+        }
         Some(Value::Nothing { .. }) => Ok("null".into()),
         Some(_) => unreachable!("Argument only accepts string or null."),
         None => Ok("raise".into()),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/replace_time_zone.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/replace_time_zone.rs
@@ -226,29 +226,33 @@ impl PluginCommand for ReplaceTimeZone {
         let value = input.into_value(call.head)?;
 
         let ambiguous = match call.get_flag::<Value>("ambiguous")? {
-            Some(Value::String { val, internal_span }) => match val.as_str() {
-                "raise" | "earliest" | "latest" => Ok(val),
-                _ => Err(ShellError::GenericError {
-                    error: "Invalid argument value".into(),
-                    msg: "`ambiguous` must be one of raise, earliest, latest, or null".into(),
-                    span: Some(internal_span),
-                    help: None,
-                    inner: vec![],
-                }),
-            },
+            Some(v @ Value::String { .. }) => {
+                let span = v.span();
+                let val = v.into_string()?;
+                match val.as_str() {
+                    "raise" | "earliest" | "latest" => Ok(val),
+                    _ => Err(ShellError::GenericError {
+                        error: "Invalid argument value".into(),
+                        msg: "`ambiguous` must be one of raise, earliest, latest, or null".into(),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    }),
+                }
+            }
             Some(Value::Nothing { .. }) => Ok("null".into()),
             Some(_) => unreachable!("Argument only accepts string or null."),
             None => Ok("raise".into()),
         }
         .map_err(LabeledError::from)?;
 
         let nonexistent = match call.get_flag::<Value>("nonexistent")? {
-            Some(Value::String { val, internal_span }) => match val.as_str() {
+            Some(v @ Value::String { .. }) => match v.as_str()? {
                 "raise" => Ok(NonExistent::Raise),
                 _ => Err(ShellError::GenericError {
                     error: "Invalid argument value".into(),
                     msg: "`nonexistent` must be one of raise or null".into(),
-                    span: Some(internal_span),
+                    span: Some(v.span()),
                     help: None,
                     inner: vec![],
                 }),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dtype/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dtype/mod.rs
