Move Value to helpers, separate span call (#10121)

# Description

As part of the refactor to split spans off of Value, this moves to using
helper functions to create values, and using `.span()` instead of
matching span out of Value directly.

Hoping to get a few more helping hands to finish this, as there are a
lot of commands to update :)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Co-authored-by: WindSoilder <windsoilder@outlook.com>
This commit is contained in:
JT
2023-09-04 02:27:29 +12:00
committed by GitHub
parent af79eb2943
commit 6cdfee3573
372 changed files with 5811 additions and 7448 deletions

View File

@ -14,22 +14,20 @@ impl CoolCustomValue {
}
pub fn into_value(self, span: Span) -> Value {
Value::CustomValue {
val: Box::new(self),
span,
}
Value::custom_value(Box::new(self), span)
}
pub fn try_from_value(value: &Value) -> Result<Self, ShellError> {
let span = value.span();
match value {
Value::CustomValue { val, span } => {
Value::CustomValue { val, .. } => {
if let Some(cool) = val.as_any().downcast_ref::<Self>() {
Ok(cool.clone())
} else {
Err(ShellError::CantConvert {
to_type: "cool".into(),
from_type: "non-cool".into(),
span: *span,
span,
help: None,
})
}
@ -37,7 +35,7 @@ impl CoolCustomValue {
x => Err(ShellError::CantConvert {
to_type: "cool".into(),
from_type: x.get_type().to_string(),
span: x.span(),
span,
help: None,
}),
}
@ -47,10 +45,7 @@ impl CoolCustomValue {
#[typetag::serde]
impl CustomValue for CoolCustomValue {
fn clone_value(&self, span: nu_protocol::Span) -> Value {
Value::CustomValue {
val: Box::new(self.clone()),
span,
}
Value::custom_value(Box::new(self.clone()), span)
}
fn value_string(&self) -> String {
@ -58,10 +53,10 @@ impl CustomValue for CoolCustomValue {
}
fn to_base_value(&self, span: nu_protocol::Span) -> Result<Value, ShellError> {
Ok(Value::String {
val: format!("I used to be a custom value! My data was ({})", self.cool),
Ok(Value::string(
format!("I used to be a custom value! My data was ({})", self.cool),
span,
})
))
}
fn as_any(&self) -> &dyn std::any::Any {

View File

@ -14,27 +14,25 @@ impl SecondCustomValue {
}
pub fn into_value(self, span: Span) -> Value {
Value::CustomValue {
val: Box::new(self),
span,
}
Value::custom_value(Box::new(self), span)
}
pub fn try_from_value(value: &Value) -> Result<Self, ShellError> {
let span = value.span();
match value {
Value::CustomValue { val, span } => match val.as_any().downcast_ref::<Self>() {
Value::CustomValue { val, .. } => match val.as_any().downcast_ref::<Self>() {
Some(value) => Ok(value.clone()),
None => Err(ShellError::CantConvert {
to_type: "cool".into(),
from_type: "non-cool".into(),
span: *span,
span,
help: None,
}),
},
x => Err(ShellError::CantConvert {
to_type: "cool".into(),
from_type: x.get_type().to_string(),
span: x.span(),
span,
help: None,
}),
}
@ -44,10 +42,7 @@ impl SecondCustomValue {
#[typetag::serde]
impl CustomValue for SecondCustomValue {
fn clone_value(&self, span: nu_protocol::Span) -> Value {
Value::CustomValue {
val: Box::new(self.clone()),
span,
}
Value::custom_value(Box::new(self.clone()), span)
}
fn value_string(&self) -> String {
@ -55,13 +50,13 @@ impl CustomValue for SecondCustomValue {
}
fn to_base_value(&self, span: nu_protocol::Span) -> Result<Value, ShellError> {
Ok(Value::String {
val: format!(
Ok(Value::string(
format!(
"I used to be a DIFFERENT custom value! ({})",
self.something
),
span,
})
))
}
fn as_any(&self) -> &dyn std::any::Any {