Skip to content

Commit a24d591

Browse files
committed
---
yaml --- r: 159085 b: refs/heads/snap-stage3 c: fcd05ed h: refs/heads/master i: 159083: def1799 v: v3
1 parent f562328 commit a24d591

File tree

40 files changed

+918
-284
lines changed

40 files changed

+918
-284
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 40fb87d40f681f5356af42175fc7b85da387f037
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 7a86aa83eea27529b1b8855cd4e2c8ce7bf787ef
4+
refs/heads/snap-stage3: fcd05ed99ff0aa6157e427a698ac53dbc450135f
55
refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/liballoc/boxed.rs

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,50 @@ impl<T: Clone> Clone for Box<T> {
6565
}
6666
}
6767

68+
// NOTE(stage0): remove impl after a snapshot
69+
#[cfg(stage0)]
70+
impl<T:PartialEq> PartialEq for Box<T> {
71+
#[inline]
72+
fn eq(&self, other: &Box<T>) -> bool { *(*self) == *(*other) }
73+
#[inline]
74+
fn ne(&self, other: &Box<T>) -> bool { *(*self) != *(*other) }
75+
}
76+
// NOTE(stage0): remove impl after a snapshot
77+
#[cfg(stage0)]
78+
impl<T:PartialOrd> PartialOrd for Box<T> {
79+
#[inline]
80+
fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> {
81+
(**self).partial_cmp(&**other)
82+
}
83+
#[inline]
84+
fn lt(&self, other: &Box<T>) -> bool { *(*self) < *(*other) }
85+
#[inline]
86+
fn le(&self, other: &Box<T>) -> bool { *(*self) <= *(*other) }
87+
#[inline]
88+
fn ge(&self, other: &Box<T>) -> bool { *(*self) >= *(*other) }
89+
#[inline]
90+
fn gt(&self, other: &Box<T>) -> bool { *(*self) > *(*other) }
91+
}
92+
// NOTE(stage0): remove impl after a snapshot
93+
#[cfg(stage0)]
94+
impl<T: Ord> Ord for Box<T> {
95+
#[inline]
96+
fn cmp(&self, other: &Box<T>) -> Ordering {
97+
(**self).cmp(&**other)
98+
}
99+
}
100+
// NOTE(stage0): remove impl after a snapshot
101+
#[cfg(stage0)]
102+
impl<T: Eq> Eq for Box<T> {}
103+
104+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
68105
impl<Sized? T: PartialEq> PartialEq for Box<T> {
69106
#[inline]
70107
fn eq(&self, other: &Box<T>) -> bool { PartialEq::eq(&**self, &**other) }
71108
#[inline]
72109
fn ne(&self, other: &Box<T>) -> bool { PartialEq::ne(&**self, &**other) }
73110
}
111+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
74112
impl<Sized? T: PartialOrd> PartialOrd for Box<T> {
75113
#[inline]
76114
fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> {
@@ -85,12 +123,14 @@ impl<Sized? T: PartialOrd> PartialOrd for Box<T> {
85123
#[inline]
86124
fn gt(&self, other: &Box<T>) -> bool { PartialOrd::gt(&**self, &**other) }
87125
}
126+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
88127
impl<Sized? T: Ord> Ord for Box<T> {
89128
#[inline]
90129
fn cmp(&self, other: &Box<T>) -> Ordering {
91130
Ord::cmp(&**self, &**other)
92131
}
93132
}
133+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
94134
impl<Sized? T: Eq> Eq for Box<T> {}
95135

96136
/// Extension methods for an owning `Any` trait object.

branches/snap-stage3/src/libcollections/str.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,13 @@ impl<'a> PartialOrd for MaybeOwned<'a> {
534534
}
535535

536536
impl<'a> Ord for MaybeOwned<'a> {
537+
// NOTE(stage0): remove method after a snapshot
538+
#[cfg(stage0)]
539+
#[inline]
540+
fn cmp(&self, other: &MaybeOwned) -> Ordering {
541+
self.as_slice().cmp(&other.as_slice())
542+
}
543+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
537544
#[inline]
538545
fn cmp(&self, other: &MaybeOwned) -> Ordering {
539546
self.as_slice().cmp(other.as_slice())

branches/snap-stage3/src/libcollections/vec.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,13 @@ impl<T: PartialEq> PartialEq for Vec<T> {
506506

507507
#[unstable = "waiting on PartialOrd stability"]
508508
impl<T: PartialOrd> PartialOrd for Vec<T> {
509+
// NOTE(stage0): remove method after a snapshot
510+
#[cfg(stage0)]
511+
#[inline]
512+
fn partial_cmp(&self, other: &Vec<T>) -> Option<Ordering> {
513+
self.as_slice().partial_cmp(&other.as_slice())
514+
}
515+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
509516
#[inline]
510517
fn partial_cmp(&self, other: &Vec<T>) -> Option<Ordering> {
511518
self.as_slice().partial_cmp(other.as_slice())
@@ -523,6 +530,13 @@ impl<T: PartialEq, V: AsSlice<T>> Equiv<V> for Vec<T> {
523530

524531
#[unstable = "waiting on Ord stability"]
525532
impl<T: Ord> Ord for Vec<T> {
533+
// NOTE(stage0): remove method after a snapshot
534+
#[cfg(stage0)]
535+
#[inline]
536+
fn cmp(&self, other: &Vec<T>) -> Ordering {
537+
self.as_slice().cmp(&other.as_slice())
538+
}
539+
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
526540
#[inline]
527541
fn cmp(&self, other: &Vec<T>) -> Ordering {
528542
self.as_slice().cmp(other.as_slice())

0 commit comments

Comments
 (0)