mirror of
https://github.com/nushell/nushell.git
synced 2025-08-19 13:15:17 +02:00
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:
@@ -140,42 +140,27 @@ prints out the list properly."#
|
||||
Example {
|
||||
description: "Render a simple list to a grid",
|
||||
example: "[1 2 3 a b c] | grid",
|
||||
result: Some(Value::String {
|
||||
val: "1 │ 2 │ 3 │ a │ b │ c\n".to_string(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
result: Some(Value::string("1 │ 2 │ 3 │ a │ b │ c\n", Span::test_data())),
|
||||
},
|
||||
Example {
|
||||
description: "The above example is the same as:",
|
||||
example: "[1 2 3 a b c] | wrap name | grid",
|
||||
result: Some(Value::String {
|
||||
val: "1 │ 2 │ 3 │ a │ b │ c\n".to_string(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
result: Some(Value::string("1 │ 2 │ 3 │ a │ b │ c\n", Span::test_data())),
|
||||
},
|
||||
Example {
|
||||
description: "Render a record to a grid",
|
||||
example: "{name: 'foo', b: 1, c: 2} | grid",
|
||||
result: Some(Value::String {
|
||||
val: "foo\n".to_string(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
result: Some(Value::string("foo\n", Span::test_data())),
|
||||
},
|
||||
Example {
|
||||
description: "Render a list of records to a grid",
|
||||
example: "[{name: 'A', v: 1} {name: 'B', v: 2} {name: 'C', v: 3}] | grid",
|
||||
result: Some(Value::String {
|
||||
val: "A │ B │ C\n".to_string(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
result: Some(Value::string("A │ B │ C\n", Span::test_data())),
|
||||
},
|
||||
Example {
|
||||
description: "Render a table with 'name' column in it to a grid",
|
||||
example: "[[name patch]; [0.1.0 false] [0.1.1 true] [0.2.0 false]] | grid",
|
||||
result: Some(Value::String {
|
||||
val: "0.1.0 │ 0.1.1 │ 0.2.0\n".to_string(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
result: Some(Value::string("0.1.0 │ 0.1.1 │ 0.2.0\n", Span::test_data())),
|
||||
},
|
||||
]
|
||||
}
|
||||
@@ -251,10 +236,7 @@ fn create_grid_output(
|
||||
|
||||
Ok(
|
||||
if let Some(grid_display) = grid.fit_into_width(cols as usize) {
|
||||
Value::String {
|
||||
val: grid_display.to_string(),
|
||||
span: call.head,
|
||||
}
|
||||
Value::string(grid_display.to_string(), call.head)
|
||||
} else {
|
||||
Value::String {
|
||||
val: format!("Couldn't fit grid into {} columns!", cols),
|
||||
|
Reference in New Issue
Block a user