From 8de01dd47bac4f4bf719a37f411887971def5d3d Mon Sep 17 00:00:00 2001 From: Zanie Date: Fri, 1 Dec 2023 13:28:26 -0600 Subject: [PATCH] Update `Range` to match upstream (#5) --- src/range.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/range.rs b/src/range.rs index 860d77ee..d1d18c11 100644 --- a/src/range.rs +++ b/src/range.rs @@ -200,7 +200,7 @@ impl Range { .segments .last() .expect("if there is a first element, there must be a last element"); - (bound_as_ref(start), bound_as_ref(&end.1)) + (start.as_ref(), end.1.as_ref()) }) } @@ -303,15 +303,6 @@ fn within_bounds(v: &V, segment: &Interval) -> Ordering { Ordering::Greater } -/// Implementation of [`Bound::as_ref`] which is currently marked as unstable. -fn bound_as_ref(bound: &Bound) -> Bound<&V> { - match bound { - Included(v) => Included(v), - Excluded(v) => Excluded(v), - Unbounded => Unbounded, - } -} - fn valid_segment(start: &Bound, end: &Bound) -> bool { match (start, end) { (Included(s), Included(e)) => s <= e, @@ -518,7 +509,7 @@ impl Display for Range { } else { for (idx, segment) in self.segments.iter().enumerate() { if idx > 0 { - write!(f, ", ")?; + write!(f, " | ")?; } match segment { (Unbounded, Unbounded) => write!(f, "*")?, @@ -529,7 +520,7 @@ impl Display for Range { if v == b { write!(f, "=={v}")? } else { - write!(f, ">={v},<={b}")? + write!(f, ">={v}, <={b}")? } } (Included(v), Excluded(b)) => write!(f, ">={v}, <{b}")?,