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
2022-12-10 02:37:51 +10:00
committed by GitHub
parent b56ad92e25
commit 220b105efb
139 changed files with 540 additions and 2141 deletions

View File

@ -307,20 +307,14 @@ fn add_month_to_table(
if should_show_year_column {
indexmap.insert(
"year".to_string(),
Value::Int {
val: month_helper.selected_year as i64,
span: tag,
},
Value::int(month_helper.selected_year as i64, tag),
);
}
if should_show_quarter_column {
indexmap.insert(
"quarter".to_string(),
Value::Int {
val: month_helper.quarter_number as i64,
span: tag,
},
Value::int(month_helper.quarter_number as i64, tag),
);
}
@ -331,10 +325,7 @@ fn add_month_to_table(
span: tag,
}
} else {
Value::Int {
val: month_helper.selected_month as i64,
span: tag,
}
Value::int(month_helper.selected_month as i64, tag)
};
indexmap.insert("month".to_string(), month_value);
@ -349,10 +340,7 @@ fn add_month_to_table(
if should_add_day_number_to_table {
let adjusted_day_number = day_number - total_start_offset;
value = Value::Int {
val: adjusted_day_number as i64,
span: tag,
};
value = Value::int(adjusted_day_number as i64, tag);
if let Some(current_day) = current_day_option {
if current_day == adjusted_day_number {

View File

@ -187,10 +187,7 @@ impl Iterator for FloatSeq {
return None;
}
self.index += 1;
Some(Value::Float {
val: count,
span: self.span,
})
Some(Value::float(count, self.span))
}
}
@ -208,10 +205,7 @@ impl Iterator for IntSeq {
{
return None;
}
let ret = Some(Value::Int {
val: self.count,
span: self.span,
});
let ret = Some(Value::int(self.count, self.span));
self.count += self.step;
ret
}