From 725b9a8e323c9ae0727fed2d045bad64eb212167 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Fri, 17 Nov 2023 10:10:40 -0600
Subject: [PATCH] Update `Range` to match upstream (#5)
---
src/range.rs | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/range.rs b/src/range.rs
index 9800c002..3fafa603 100644
--- a/src/range.rs
+++ b/src/range.rs
@@ -199,7 +199,7 @@ impl<V: Ord> Range<V> {
.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())
})
}
@@ -268,15 +268,6 @@ impl<V: Ord> Range<V> {
}
}
-/// Implementation of [`Bound::as_ref`] which is currently marked as unstable.
-fn bound_as_ref<V>(bound: &Bound<V>) -> Bound<&V> {
- match bound {
- Included(v) => Included(v),
- Excluded(v) => Excluded(v),
- Unbounded => Unbounded,
- }
-}
-
fn valid_segment<T: PartialOrd>(start: &Bound<T>, end: &Bound<T>) -> bool {
match (start, end) {
(Included(s), Included(e)) => s <= e,
@@ -311,7 +302,7 @@ impl<V: Ord + Clone> Range<V> {
(Included(i), Excluded(e)) | (Excluded(e), Included(i)) if i <= e => Excluded(e),
(Included(i), Excluded(e)) | (Excluded(e), Included(i)) if e < i => Included(i),
- (s, Unbounded) | (Unbounded, s) => bound_as_ref(s),
+ (s, Unbounded) | (Unbounded, s) => s.as_ref(),
_ => unreachable!(),
}
.cloned();
@@ -321,7 +312,7 @@ impl<V: Ord + Clone> Range<V> {
(Included(i), Excluded(e)) | (Excluded(e), Included(i)) if i >= e => Excluded(e),
(Included(i), Excluded(e)) | (Excluded(e), Included(i)) if e > i => Included(i),
- (s, Unbounded) | (Unbounded, s) => bound_as_ref(s),
+ (s, Unbounded) | (Unbounded, s) => s.as_ref(),
_ => unreachable!(),
}
.cloned();
@@ -377,7 +368,7 @@ impl<V: Display + Eq> Display for Range<V> {
} else {
for (idx, segment) in self.segments.iter().enumerate() {
if idx > 0 {
- write!(f, ", ")?;
+ write!(f, " | ")?;
}
match segment {
(Unbounded, Unbounded) => write!(f, "*")?,
@@ -388,7 +379,7 @@ impl<V: Display + Eq> Display for Range<V> {
if v == b {
write!(f, "=={v}")?
} else {
- write!(f, ">={v},<={b}")?
+ write!(f, ">={v}, <={b}")?
}
}
(Included(v), Excluded(b)) => write!(f, ">={v}, <{b}")?,