bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add symmetric requirement of PartialOrd.

Browse source
This commit is contained in:
Steven Malis 2018-04-10 19:26:25 -07:00
parent 249dc9e5cd
commit 51f24ec7f0
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcore/ops/range.rs
View file

@ -119,7 +119,7 @@ impl<Idx: PartialOrd<Idx>> Range<Idx> {
pub fn contains<U>(&self, item: &U) -> bool pub fn contains<U>(&self, item: &U) -> bool
where where
Idx: PartialOrd<U>, Idx: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<Idx>,
{ {
<Self as RangeBounds<Idx>>::contains(self, item) <Self as RangeBounds<Idx>>::contains(self, item)
} }
@ -212,7 +212,7 @@ impl<Idx: PartialOrd<Idx>> RangeFrom<Idx> {
pub fn contains<U>(&self, item: &U) -> bool pub fn contains<U>(&self, item: &U) -> bool
where where
Idx: PartialOrd<U>, Idx: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<Idx>,
{ {
<Self as RangeBounds<Idx>>::contains(self, item) <Self as RangeBounds<Idx>>::contains(self, item)
} }
@ -293,7 +293,7 @@ impl<Idx: PartialOrd<Idx>> RangeTo<Idx> {
pub fn contains<U>(&self, item: &U) -> bool pub fn contains<U>(&self, item: &U) -> bool
where where
Idx: PartialOrd<U>, Idx: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<Idx>,
{ {
<Self as RangeBounds<Idx>>::contains(self, item) <Self as RangeBounds<Idx>>::contains(self, item)
} }
@ -369,7 +369,7 @@ impl<Idx: PartialOrd<Idx>> RangeInclusive<Idx> {
pub fn contains<U>(&self, item: &U) -> bool pub fn contains<U>(&self, item: &U) -> bool
where where
Idx: PartialOrd<U>, Idx: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<Idx>,
{ {
<Self as RangeBounds<Idx>>::contains(self, item) <Self as RangeBounds<Idx>>::contains(self, item)
} }
@ -487,7 +487,7 @@ impl<Idx: PartialOrd<Idx>> RangeToInclusive<Idx> {
pub fn contains<U>(&self, item: &U) -> bool pub fn contains<U>(&self, item: &U) -> bool
where where
Idx: PartialOrd<U>, Idx: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<Idx>,
{ {
<Self as RangeBounds<Idx>>::contains(self, item) <Self as RangeBounds<Idx>>::contains(self, item)
} }
@ -612,7 +612,7 @@ pub trait RangeBounds<T: ?Sized> {
fn contains<U>(&self, item: &U) -> bool fn contains<U>(&self, item: &U) -> bool
where where
T: PartialOrd<U>, T: PartialOrd<U>,
U: ?Sized, U: ?Sized + PartialOrd<T>,
{ {
(match self.start() { (match self.start() {
Included(ref start) => *start <= item, Included(ref start) => *start <= item,
@ -621,8 +621,8 @@ pub trait RangeBounds<T: ?Sized> {
}) })
&& &&
(match self.end() { (match self.end() {
Included(ref end) => *end >= item, Included(ref end) => item <= *end,
Excluded(ref end) => *end > item, Excluded(ref end) => item < *end,
Unbounded => true, Unbounded => true,
}) })
} }