extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 06:55:36 +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

60
crates/nu-protocol/src/value/mod.rs
View File

@ -109,14 +109,8 @@ pub enum Value {
impl Clone for Value {
fn clone(&self) -> Self {
match self {
Value::Bool { val, span } => Value::Bool {
val: *val,
span: *span,
},
Value::Int { val, span } => Value::Int {
val: *val,
span: *span,
},
Value::Bool { val, span } => Value::boolean(*val, *span),
Value::Int { val, span } => Value::int(*val, *span),
Value::Filesize { val, span } => Value::Filesize {
val: *val,
span: *span,
@ -133,10 +127,7 @@ impl Clone for Value {
val: val.clone(),
span: *span,
},
Value::Float { val, span } => Value::Float {
val: *val,
span: *span,
},
Value::Float { val, span } => Value::float(*val, *span),
Value::String { val, span } => Value::String {
val: val.clone(),
span: *span,
@ -668,10 +659,7 @@ impl Value {
}
Value::Binary { val, .. } => {
if let Some(item) = val.get(*count) {
current = Value::Int {
val: *item as i64,
span: *origin_span,
};
current = Value::int(*item as i64, *origin_span);
} else if val.is_empty() {
return Err(ShellError::AccessEmptyContent(*origin_span))
} else {
@ -1330,10 +1318,7 @@ impl Value {
/// Note: Only use this for test data, *not* live data, as it will point into unknown source
/// when used in errors.
pub fn test_string(s: impl Into<String>) -> Value {
Value::String {
val: s.into(),
span: Span::test_data(),
}
Value::string(s, Span::test_data())
}
/// Note: Only use this for test data, *not* live data, as it will point into unknown source
@ -3382,46 +3367,25 @@ mod tests {
#[test]
fn test_list() {
let list_of_ints = Value::List {
vals: vec![Value::Int {
val: 0,
span: Span::unknown(),
}],
vals: vec![Value::int(0, Span::unknown())],
span: Span::unknown(),
};
let list_of_floats = Value::List {
vals: vec![Value::Float {
val: 0.0,
span: Span::unknown(),
}],
vals: vec![Value::float(0.0, Span::unknown())],
span: Span::unknown(),
};
let list_of_ints_and_floats = Value::List {
vals: vec![
Value::Int {
val: 0,
span: Span::unknown(),
},
Value::Float {
val: 0.0,
span: Span::unknown(),
},
Value::int(0, Span::unknown()),
Value::float(0.0, Span::unknown()),
],
span: Span::unknown(),
};
let list_of_ints_and_floats_and_bools = Value::List {
vals: vec![
Value::Int {
val: 0,
span: Span::unknown(),
},
Value::Float {
val: 0.0,
span: Span::unknown(),
},
Value::Bool {
val: false,
span: Span::unknown(),
},
Value::int(0, Span::unknown()),
Value::float(0.0, Span::unknown()),
Value::boolean(false, Span::unknown()),
],
span: Span::unknown(),
};

30
crates/nu-protocol/src/value/range.rs
View File

@ -29,25 +29,16 @@ impl Range {
// Select from & to values if they're not specified
// TODO: Replace the placeholder values with proper min/max for range based on data type
let from = if let Value::Nothing { .. } = from {
Value::Int {
val: 0i64,
span: expr_span,
}
Value::int(0i64, expr_span)
} else {
from
};
let to = if let Value::Nothing { .. } = to {
if let Ok(Value::Bool { val: true, .. }) = next.lt(expr_span, &from, expr_span) {
Value::Int {
val: i64::MIN,
span: expr_span,
}
Value::int(i64::MIN, expr_span)
} else {
Value::Int {
val: i64::MAX,
span: expr_span,
}
Value::int(i64::MAX, expr_span)
}
} else {
to
@ -62,24 +53,15 @@ impl Range {
// Convert the next value into the inctement
let incr = if let Value::Nothing { .. } = next {
if moves_up {
Value::Int {
val: 1i64,
span: expr_span,
}
Value::int(1i64, expr_span)
} else {
Value::Int {
val: -1i64,
span: expr_span,
}
Value::int(-1i64, expr_span)
}
} else {
next.sub(operator.next_op_span, &from, expr_span)?
};
let zero = Value::Int {
val: 0i64,
span: expr_span,
};
let zero = Value::int(0i64, expr_span);
// Increment must be non-zero, otherwise we iterate forever
if matches!(