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

@ -31,12 +31,7 @@ impl Inc {
Some(Action::SemVerAction(act_on)) => {
let mut ver = match semver::Version::parse(input) {
Ok(parsed_ver) => parsed_ver,
Err(_) => {
return Value::String {
val: input.to_string(),
span: head,
}
}
Err(_) => return Value::string(input, head),
};
match act_on {
@ -45,20 +40,11 @@ impl Inc {
SemVerAction::Patch => ver.increment_patch(),
}
Value::String {
val: ver.to_string(),
span: head,
}
Value::string(ver.to_string(), head)
}
Some(Action::Default) | None => match input.parse::<u64>() {
Ok(v) => Value::String {
val: (v + 1).to_string(),
span: head,
},
Err(_) => Value::String {
val: input.to_string(),
span: head,
},
Ok(v) => Value::string((v + 1).to_string(), head),
Err(_) => Value::string(input, head),
},
}
}
@ -105,10 +91,7 @@ impl Inc {
pub fn inc_value(&self, head: Span, value: &Value) -> Result<Value, LabeledError> {
match value {
Value::Int { val, span } => Ok(Value::Int {
val: val + 1,
span: *span,
}),
Value::Int { val, span } => Ok(Value::int(val + 1, *span)),
Value::String { val, .. } => Ok(self.apply(val, head)),
x => {
let msg = x.as_string().map_err(|e| LabeledError {
@ -137,10 +120,7 @@ mod tests {
#[test]
fn major() {
let expected = Value::String {
val: "1.0.0".to_string(),
span: Span::test_data(),
};
let expected = Value::string("1.0.0", Span::test_data());
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Major);
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)
@ -148,10 +128,7 @@ mod tests {
#[test]
fn minor() {
let expected = Value::String {
val: "0.2.0".to_string(),
span: Span::test_data(),
};
let expected = Value::string("0.2.0", Span::test_data());
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Minor);
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)
@ -159,10 +136,7 @@ mod tests {
#[test]
fn patch() {
let expected = Value::String {
val: "0.1.4".to_string(),
span: Span::test_data(),
};
let expected = Value::string("0.1.4", Span::test_data());
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Patch);
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)