Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-15 14:44:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement PartialOrd for Value::Stream

Browse source
This commit is contained in:
Arthur Targaryen 2021-10-09 19:11:15 +02:00
parent 4e443b2088
commit 75de7f7e61
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/nu-protocol/src/value/mod.rs
View file

@ -479,9 +479,7 @@ impl PartialOrd for Value {
(Value::Block { val: b1, .. }, Value::Block { val: b2, .. }) if b1 == b2 => { (Value::Block { val: b1, .. }, Value::Block { val: b2, .. }) if b1 == b2 => {
Some(Ordering::Equal) Some(Ordering::Equal)
} }
(Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) if lhs == rhs => { (Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) => lhs.partial_cmp(rhs),
Some(Ordering::Equal)
}
( (
Value::Record { Value::Record {
vals: lhs, vals: lhs,
@ -531,6 +529,18 @@ impl PartialOrd for Value {
(Value::Stream { stream: lhs, .. }, Value::Stream { stream: rhs, .. }) => { (Value::Stream { stream: lhs, .. }, Value::Stream { stream: rhs, .. }) => {
lhs.clone().partial_cmp(rhs.clone()) lhs.clone().partial_cmp(rhs.clone())
} }
(Value::Stream { stream: lhs, .. }, Value::String { val: rhs, .. }) => {
lhs.clone().collect_string().partial_cmp(rhs)
}
(Value::String { val: lhs, .. }, Value::Stream { stream: rhs, .. }) => {
lhs.partial_cmp(&rhs.clone().collect_string())
}
(Value::Stream { stream: lhs, .. }, Value::List { vals: rhs, .. }) => {
lhs.clone().collect::<Vec<Value>>().partial_cmp(rhs)
}
(Value::List { vals: lhs, .. }, Value::Stream { stream: rhs, .. }) => {
lhs.partial_cmp(&rhs.clone().collect::<Vec<Value>>())
}
(_, _) => None, (_, _) => None,
} }
} }
@ -846,7 +856,6 @@ impl Value {
span, span,
}), }),
(lhs, Value::Stream { stream: rhs, .. }) => Ok(Value::Bool { (lhs, Value::Stream { stream: rhs, .. }) => Ok(Value::Bool {
// TODO(@arthur-targaryen): Not sure about this clone (see also `Value::not_in`).
val: rhs.clone().any(|x| lhs == &x), val: rhs.clone().any(|x| lhs == &x),
span, span,
}), }),
@ -881,7 +890,6 @@ impl Value {
span, span,
}), }),
(lhs, Value::Stream { stream: rhs, .. }) => Ok(Value::Bool { (lhs, Value::Stream { stream: rhs, .. }) => Ok(Value::Bool {
// TODO(@arthur-targaryen): Not sure about this clone (see also `Value::r#in`).
val: rhs.clone().all(|x| lhs != &x), val: rhs.clone().all(|x| lhs != &x),
span, span,
}), }),