Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify Result<Value, _> comparaison using matches!

Browse Source
This commit is contained in:
Arthur Targaryen 2021-10-09 01:31:18 +02:00
parent d3bc096d47
commit 7db6b876ab
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1020,37 +1020,42 @@ impl Value {
match (self, rhs) { match (self, rhs) {
(lhs, Value::Range { val: rhs, .. }) => Ok(Value::Bool { (lhs, Value::Range { val: rhs, .. }) => Ok(Value::Bool {
val: if rhs val: if matches!(
.incr rhs.incr.gt(
.gt(
Span::unknown(), Span::unknown(),
&Value::Int { &Value::Int {
val: 0, val: 0,
span: Span::unknown(), span: Span::unknown()
}, }
) ),
.map_or(false, |v| v.is_true()) Ok(Value::Bool { val: true, .. })
{ ) {
lhs.gte(Span::unknown(), &rhs.from) matches!(
.map_or(false, |v| v.is_true()) lhs.gte(Span::unknown(), &rhs.from),
&& match rhs.inclusion { Ok(Value::Bool { val: true, .. })
RangeInclusion::Inclusive => lhs ) && match rhs.inclusion {
.lte(Span::unknown(), &rhs.to) RangeInclusion::Inclusive => matches!(
.map_or(false, |v| v.is_true()), lhs.lte(Span::unknown(), &rhs.to),
RangeInclusion::RightExclusive => lhs Ok(Value::Bool { val: true, .. })
.lt(Span::unknown(), &rhs.to) ),
.map_or(false, |v| v.is_true()), RangeInclusion::RightExclusive => matches!(
lhs.lt(Span::unknown(), &rhs.to),
Ok(Value::Bool { val: true, .. })
),
} }
} else { } else {
lhs.lte(Span::unknown(), &rhs.from) matches!(
.map_or(false, |v| v.is_true()) lhs.lte(Span::unknown(), &rhs.from),
&& match rhs.inclusion { Ok(Value::Bool { val: true, .. })
RangeInclusion::Inclusive => lhs ) && match rhs.inclusion {
.gte(Span::unknown(), &rhs.to) RangeInclusion::Inclusive => matches!(
.map_or(false, |v| v.is_true()), lhs.gte(Span::unknown(), &rhs.to),
RangeInclusion::RightExclusive => lhs Ok(Value::Bool { val: true, .. })
.gt(Span::unknown(), &rhs.to) ),
.map_or(false, |v| v.is_true()), RangeInclusion::RightExclusive => matches!(
lhs.gt(Span::unknown(), &rhs.to),
Ok(Value::Bool { val: true, .. })
),
} }
}, },