mirror of
https://github.com/nushell/nushell.git
synced 2025-08-17 02:51:15 +02:00
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
GitHub
@ -172,48 +172,46 @@ fn action(input: &Value, arg: &Arguments, head: Span) -> Value {
|
||||
let trim_side = &arg.trim_side;
|
||||
let mode = &arg.mode;
|
||||
match input {
|
||||
Value::String { val: s, .. } => Value::String {
|
||||
val: trim(s, char_, trim_side),
|
||||
span: head,
|
||||
},
|
||||
Value::String { val: s, .. } => Value::string(trim(s, char_, trim_side), head),
|
||||
// Propagate errors by explicitly matching them before the final case.
|
||||
Value::Error { .. } => input.clone(),
|
||||
other => match mode {
|
||||
ActionMode::Global => match other {
|
||||
Value::Record { val: record, span } => {
|
||||
let new_vals = record.vals.iter().map(|v| action(v, arg, head)).collect();
|
||||
other => {
|
||||
let span = other.span();
|
||||
|
||||
Value::record(
|
||||
Record {
|
||||
cols: record.cols.to_vec(),
|
||||
vals: new_vals,
|
||||
},
|
||||
*span,
|
||||
match mode {
|
||||
ActionMode::Global => match other {
|
||||
Value::Record { val: record, .. } => {
|
||||
let new_vals = record.vals.iter().map(|v| action(v, arg, head)).collect();
|
||||
|
||||
Value::record(
|
||||
Record {
|
||||
cols: record.cols.to_vec(),
|
||||
vals: new_vals,
|
||||
},
|
||||
span,
|
||||
)
|
||||
}
|
||||
Value::List { vals, .. } => {
|
||||
let new_vals = vals.iter().map(|v| action(v, arg, head)).collect();
|
||||
|
||||
Value::list(new_vals, span)
|
||||
}
|
||||
_ => input.clone(),
|
||||
},
|
||||
ActionMode::Local => {
|
||||
Value::error(
|
||||
ShellError::UnsupportedInput(
|
||||
"Only string values are supported".into(),
|
||||
format!("input type: {:?}", other.get_type()),
|
||||
head,
|
||||
// This line requires the Value::Error match above.
|
||||
other.span(),
|
||||
),
|
||||
head,
|
||||
)
|
||||
}
|
||||
Value::List { vals, span } => {
|
||||
let new_vals = vals.iter().map(|v| action(v, arg, head)).collect();
|
||||
|
||||
Value::List {
|
||||
vals: new_vals,
|
||||
span: *span,
|
||||
}
|
||||
}
|
||||
_ => input.clone(),
|
||||
},
|
||||
ActionMode::Local => {
|
||||
Value::Error {
|
||||
error: Box::new(ShellError::UnsupportedInput(
|
||||
"Only string values are supported".into(),
|
||||
format!("input type: {:?}", other.get_type()),
|
||||
head,
|
||||
// This line requires the Value::Error match above.
|
||||
other.span(),
|
||||
)),
|
||||
span: head,
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -261,13 +259,12 @@ mod tests {
|
||||
}
|
||||
|
||||
fn make_list(vals: Vec<&str>) -> Value {
|
||||
Value::List {
|
||||
vals: vals
|
||||
.iter()
|
||||
Value::list(
|
||||
vals.iter()
|
||||
.map(|x| Value::test_string(x.to_string()))
|
||||
.collect(),
|
||||
span: Span::test_data(),
|
||||
}
|
||||
Span::test_data(),
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
@ -422,22 +419,22 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn global_trim_left_table() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
let row = Value::list(
|
||||
vec![
|
||||
Value::test_string(" a "),
|
||||
Value::test_int(65),
|
||||
Value::test_string(" d"),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Span::test_data(),
|
||||
);
|
||||
let expected = Value::list(
|
||||
vec![
|
||||
Value::test_string("a "),
|
||||
Value::test_int(65),
|
||||
Value::test_string("d"),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
Span::test_data(),
|
||||
);
|
||||
|
||||
let args = Arguments {
|
||||
to_trim: None,
|
||||
@ -522,22 +519,22 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn global_trim_right_table() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
let row = Value::list(
|
||||
vec![
|
||||
Value::test_string(" a "),
|
||||
Value::test_int(65),
|
||||
Value::test_string(" d"),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Span::test_data(),
|
||||
);
|
||||
let expected = Value::list(
|
||||
vec![
|
||||
Value::test_string(" a"),
|
||||
Value::test_int(65),
|
||||
Value::test_string(" d"),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
Span::test_data(),
|
||||
);
|
||||
let args = Arguments {
|
||||
to_trim: None,
|
||||
trim_side: TrimSide::Right,
|
||||
|
||||
Reference in New Issue
Block a user