extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 04:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
# 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
2022-12-10 02:37:51 +10:00
committed by GitHub
parent b56ad92e25
commit 220b105efb
139 changed files with 540 additions and 2141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-command/src/formats/from/eml.rs
View File

@ -168,10 +168,7 @@ fn headerfieldvalue_to_value(head: Span, value: &HeaderFieldValue) -> Value {
.collect(),
span: head,
},
Unstructured(s) => Value::String {
val: s.to_string(),
span: head,
},
Unstructured(s) => Value::string(s, head),
Empty => Value::nothing(head),
}
}

10
crates/nu-command/src/formats/from/ini.rs
View File

@ -34,14 +34,8 @@ b=2' | from ini",
vals: vec![Value::Record {
cols: vec!["a".to_string(), "b".to_string()],
vals: vec![
Value::String {
val: "1".to_string(),
span: Span::test_data(),
},
Value::String {
val: "2".to_string(),
span: Span::test_data(),
},
Value::string("1", Span::test_data()),
Value::string("2", Span::test_data()),
],
span: Span::test_data(),
}],

20
crates/nu-command/src/formats/from/json.rs
View File

@ -31,10 +31,7 @@ impl Command for FromJson {
description: "Converts json formatted string to table",
result: Some(Value::Record {
cols: vec!["a".to_string()],
vals: vec![Value::Int {
val: 1,
span: Span::test_data(),
}],
vals: vec![Value::int(1, Span::test_data())],
span: Span::test_data(),
}),
},
@ -44,20 +41,11 @@ impl Command for FromJson {
result: Some(Value::Record {
cols: vec!["a".to_string(), "b".to_string()],
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::List {
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::Int {
val: 2,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::int(2, Span::test_data()),
],
span: Span::test_data(),
},

20
crates/nu-command/src/formats/from/nuon.rs
View File

@ -29,10 +29,7 @@ impl Command for FromNuon {
description: "Converts nuon formatted string to table",
result: Some(Value::Record {
cols: vec!["a".to_string()],
vals: vec![Value::Int {
val: 1,
span: Span::test_data(),
}],
vals: vec![Value::int(1, Span::test_data())],
span: Span::test_data(),
}),
},
@ -42,20 +39,11 @@ impl Command for FromNuon {
result: Some(Value::Record {
cols: vec!["a".to_string(), "b".to_string()],
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::List {
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::Int {
val: 2,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::int(2, Span::test_data()),
],
span: Span::test_data(),
},

15
crates/nu-command/src/formats/from/ods.rs
View File

@ -133,18 +133,9 @@ fn from_ods(
let value = match cell {
DataType::Empty => Value::nothing(head),
DataType::String(s) => Value::string(s, head),
DataType::Float(f) => Value::Float {
val: *f,
span: head,
},
DataType::Int(i) => Value::Int {
val: *i,
span: head,
},
DataType::Bool(b) => Value::Bool {
val: *b,
span: head,
},
DataType::Float(f) => Value::float(*f, head),
DataType::Int(i) => Value::int(*i, head),
DataType::Bool(b) => Value::boolean(*b, head),
_ => Value::nothing(head),
};

4
crates/nu-command/src/formats/from/ssv.rs
View File

@ -44,13 +44,13 @@ impl Command for FromSsv {
example: r#"'FOO BAR
1 2' | from ssv"#,
description: "Converts ssv formatted string to table",
result: Some(Value::List { vals: vec![Value::Record { cols: vec!["FOO".to_string(), "BAR".to_string()], vals: vec![Value::String { val: "1".to_string(), span: Span::test_data() }, Value::String { val: "2".to_string(), span: Span::test_data() }], span: Span::test_data() }], span: Span::test_data() }),
result: Some(Value::List { vals: vec![Value::Record { cols: vec!["FOO".to_string(), "BAR".to_string()], vals: vec![Value::string("1", Span::test_data()), Value::string("2", Span::test_data())], span: Span::test_data() }], span: Span::test_data() }),
}, Example {
example: r#"'FOO BAR
1 2' | from ssv -n"#,
description: "Converts ssv formatted string to table but not treating the first row as column names",
result: Some(
Value::List { vals: vec![Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::String { val: "FOO".to_string(), span: Span::test_data() }, Value::String { val: "BAR".to_string(), span: Span::test_data() }], span: Span::test_data() }, Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::String { val: "1".to_string(), span: Span::test_data() }, Value::String { val: "2".to_string(), span: Span::test_data() }], span: Span::test_data() }], span: Span::test_data() }),
Value::List { vals: vec![Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::string("FOO", Span::test_data()), Value::string("BAR", Span::test_data())], span: Span::test_data() }, Value::Record { cols: vec!["column1".to_string(), "column2".to_string()], vals: vec![Value::string("1", Span::test_data()), Value::string("2", Span::test_data())], span: Span::test_data() }], span: Span::test_data() }),
}]
}

20
crates/nu-command/src/formats/from/toml.rs
View File

@ -29,10 +29,7 @@ impl Command for FromToml {
description: "Converts toml formatted string to record",
result: Some(Value::Record {
cols: vec!["a".to_string()],
vals: vec![Value::Int {
val: 1,
span: Span::test_data(),
}],
vals: vec![Value::int(1, Span::test_data())],
span: Span::test_data(),
}),
},
@ -43,20 +40,11 @@ b = [1, 2]' | from toml",
result: Some(Value::Record {
cols: vec!["a".to_string(), "b".to_string()],
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::List {
vals: vec![
Value::Int {
val: 1,
span: Span::test_data(),
},
Value::Int {
val: 2,
span: Span::test_data(),
},
Value::int(1, Span::test_data()),
Value::int(2, Span::test_data()),
],
span: Span::test_data(),
},

30
crates/nu-command/src/formats/from/vcf.rs
View File

@ -57,14 +57,8 @@ END:VCARD' | from vcf",
"params".to_string(),
],
vals: vec![
Value::String {
val: "N".to_string(),
span: Span::test_data(),
},
Value::String {
val: "Foo".to_string(),
span: Span::test_data(),
},
Value::string("N", Span::test_data()),
Value::string("Foo", Span::test_data()),
Value::Nothing {
span: Span::test_data(),
},
@ -78,14 +72,8 @@ END:VCARD' | from vcf",
"params".to_string(),
],
vals: vec![
Value::String {
val: "FN".to_string(),
span: Span::test_data(),
},
Value::String {
val: "Bar".to_string(),
span: Span::test_data(),
},
Value::string("FN", Span::test_data()),
Value::string("Bar", Span::test_data()),
Value::Nothing {
span: Span::test_data(),
},
@ -99,14 +87,8 @@ END:VCARD' | from vcf",
"params".to_string(),
],
vals: vec![
Value::String {
val: "EMAIL".to_string(),
span: Span::test_data(),
},
Value::String {
val: "foo@bar.com".to_string(),
span: Span::test_data(),
},
Value::string("EMAIL", Span::test_data()),
Value::string("foo@bar.com", Span::test_data()),
Value::Nothing {
span: Span::test_data(),
},

15
crates/nu-command/src/formats/from/xlsx.rs
View File

@ -133,18 +133,9 @@ fn from_xlsx(
let value = match cell {
DataType::Empty => Value::nothing(head),
DataType::String(s) => Value::string(s, head),
DataType::Float(f) => Value::Float {
val: *f,
span: head,
},
DataType::Int(i) => Value::Int {
val: *i,
span: head,
},
DataType::Bool(b) => Value::Bool {
val: *b,
span: head,
},
DataType::Float(f) => Value::float(*f, head),
DataType::Int(i) => Value::int(*i, head),
DataType::Bool(b) => Value::boolean(*b, head),
_ => Value::nothing(head),
};

10
crates/nu-command/src/formats/from/xml.rs
View File

@ -54,10 +54,7 @@ impl Command for FromXml {
cols: vec!["children".to_string(), "attributes".to_string()],
vals: vec![
Value::List {
vals: vec![Value::String {
val: "Event".to_string(),
span: Span::test_data(),
}],
vals: vec![Value::string("Event", Span::test_data())],
span: Span::test_data(),
},
Value::Record {
@ -201,10 +198,7 @@ mod tests {
use nu_protocol::{Spanned, Value};
fn string(input: impl Into<String>) -> Value {
Value::String {
val: input.into(),
span: Span::test_data(),
}
Value::string(input, Span::test_data())
}
fn row(entries: IndexMap<String, Value>) -> Value {

15
crates/nu-command/src/formats/from/yaml.rs
View File

@ -181,10 +181,7 @@ pub fn get_examples() -> Vec<Example> {
description: "Converts yaml formatted string to table",
result: Some(Value::Record {
cols: vec!["a".to_string()],
vals: vec![Value::Int {
val: 1,
span: Span::test_data(),
}],
vals: vec![Value::int(1, Span::test_data())],
span: Span::test_data(),
}),
},
@ -240,10 +237,7 @@ mod test {
input: r#"value: "{{ something }}""#,
expected: Ok(Value::Record {
cols: vec!["value".to_string()],
vals: vec![Value::String {
val: "{{ something }}".to_string(),
span: Span::test_data(),
}],
vals: vec![Value::string("{{ something }}", Span::test_data())],
span: Span::test_data(),
}),
},
@ -252,10 +246,7 @@ mod test {
input: r#"value: {{ something }}"#,
expected: Ok(Value::Record {
cols: vec!["value".to_string()],
vals: vec![Value::String {
val: "{{ something }}".to_string(),
span: Span::test_data(),
}],
vals: vec![Value::string("{{ something }}", Span::test_data())],
span: Span::test_data(),
}),
},