mirror of
https://github.com/nushell/nushell.git
synced 2025-08-15 02:32:51 +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:
@ -128,10 +128,7 @@ fn help_frame_data(
|
||||
|
||||
macro_rules! nu_str {
|
||||
($text:expr) => {
|
||||
Value::String {
|
||||
val: $text.to_string(),
|
||||
span: NuSpan::unknown(),
|
||||
}
|
||||
Value::string($text.to_string(), NuSpan::unknown())
|
||||
};
|
||||
}
|
||||
|
||||
@ -191,10 +188,7 @@ fn help_frame_data(
|
||||
fn help_manual_data(manual: &HelpManual, aliases: &[String]) -> (Vec<String>, Vec<Vec<Value>>) {
|
||||
macro_rules! nu_str {
|
||||
($text:expr) => {
|
||||
Value::String {
|
||||
val: $text.to_string(),
|
||||
span: NuSpan::unknown(),
|
||||
}
|
||||
Value::string($text, NuSpan::unknown())
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -621,10 +621,7 @@ fn transpose_table(layer: &mut RecordLayer<'_>) {
|
||||
let mut data = _transpose_table(&layer.records, count_rows, count_columns);
|
||||
|
||||
for (column, column_name) in layer.columns.iter().enumerate() {
|
||||
let value = Value::String {
|
||||
val: column_name.to_string(),
|
||||
span: NuSpan::unknown(),
|
||||
};
|
||||
let value = Value::string(column_name, NuSpan::unknown());
|
||||
|
||||
data[column].insert(0, value);
|
||||
}
|
||||
|
Reference in New Issue
Block a user