forked from extern/nushell
Reduced LOC by replacing several instances of Value::Int {}, Value::Float{}, Value::Bool {}, and Value::String {} with Value::int(), Value::float(), Value::boolean() and Value::string() (#7412)
# Description
While perusing Value.rs, I noticed the `Value::int()`, `Value::float()`,
`Value::boolean()` and `Value::string()` constructors, which seem
designed to make it easier to construct various Values, but which aren't
used often at all in the codebase. So, using a few find-replaces
regexes, I increased their usage. This reduces overall LOC because
structures like this:
```
Value::Int {
val: a,
span: head
}
```
are changed into
```
Value::int(a, head)
```
and are respected as such by the project's formatter.
There are little readability concerns because the second argument to all
of these is `span`, and it's almost always extremely obvious which is
the span at every callsite.
# User-Facing Changes
None.
# 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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# 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.
This commit is contained in:
Leon
GitHub
@ -295,10 +295,7 @@ mod tests {
|
||||
cols: cols.iter().map(|x| x.to_string()).collect(),
|
||||
vals: vals
|
||||
.iter()
|
||||
.map(|x| Value::String {
|
||||
val: x.to_string(),
|
||||
span: Span::test_data(),
|
||||
})
|
||||
.map(|x| Value::string(x.to_string(), Span::test_data()))
|
||||
.collect(),
|
||||
span: Span::test_data(),
|
||||
}
|
||||
@ -308,10 +305,7 @@ mod tests {
|
||||
Value::List {
|
||||
vals: vals
|
||||
.iter()
|
||||
.map(|x| Value::String {
|
||||
val: x.to_string(),
|
||||
span: Span::test_data(),
|
||||
})
|
||||
.map(|x| Value::string(x.to_string(), Span::test_data()))
|
||||
.collect(),
|
||||
span: Span::test_data(),
|
||||
}
|
||||
@ -475,35 +469,17 @@ mod tests {
|
||||
fn global_trims_table_all_white_space() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " nu shell ".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string(" nu shell ", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string(" d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nushell".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string("nushell", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string("d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
@ -565,35 +541,17 @@ mod tests {
|
||||
fn global_trims_table_all_custom_character() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "##nu####shell##".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "#d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string("##nu####shell##", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string("#d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nushell".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string("nushell", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string("d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
@ -693,35 +651,17 @@ mod tests {
|
||||
fn global_trim_left_table() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a ".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string(" a ", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string(" d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "a ".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string("a ", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string("d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
@ -836,35 +776,17 @@ mod tests {
|
||||
fn global_trim_right_table() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a ".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string(" a ", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string(" d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string(" a", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string(" d", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
@ -981,35 +903,17 @@ mod tests {
|
||||
fn global_trim_format_flag_table() {
|
||||
let row = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a b c d ".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " b c d e f".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string(" a b c d ", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string(" b c d e f", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "a b c d".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "b c d e f".to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::string("a b c d", Span::test_data()),
|
||||
Value::int(65, Span::test_data()),
|
||||
Value::string("b c d e f", Span::test_data()),
|
||||
],
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user