Skip to content

Commit 5d432d9

Browse files
committed
---
yaml --- r: 151694 b: refs/heads/try2 c: 8f9cbe0 h: refs/heads/master v: v3
1 parent a73a4d9 commit 5d432d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1027
-3635
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 6a2b3d14711771a02b1247ce664c67de1b68f2e6
8+
refs/heads/try2: 8f9cbe08c61b05527e6d48589d4a963126448467
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/cmp.rs

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -217,29 +217,6 @@ mod impls {
217217
}
218218
impl<'a, T: TotalEq> TotalEq for &'a T {}
219219

220-
// &mut pointers
221-
impl<'a, T: Eq> Eq for &'a mut T {
222-
#[inline]
223-
fn eq(&self, other: &&'a mut T) -> bool { **self == *(*other) }
224-
#[inline]
225-
fn ne(&self, other: &&'a mut T) -> bool { **self != *(*other) }
226-
}
227-
impl<'a, T: Ord> Ord for &'a mut T {
228-
#[inline]
229-
fn lt(&self, other: &&'a mut T) -> bool { **self < **other }
230-
#[inline]
231-
fn le(&self, other: &&'a mut T) -> bool { **self <= **other }
232-
#[inline]
233-
fn ge(&self, other: &&'a mut T) -> bool { **self >= **other }
234-
#[inline]
235-
fn gt(&self, other: &&'a mut T) -> bool { **self > **other }
236-
}
237-
impl<'a, T: TotalOrd> TotalOrd for &'a mut T {
238-
#[inline]
239-
fn cmp(&self, other: &&'a mut T) -> Ordering { (**self).cmp(*other) }
240-
}
241-
impl<'a, T: TotalEq> TotalEq for &'a mut T {}
242-
243220
// @ pointers
244221
impl<T:Eq> Eq for @T {
245222
#[inline]
@@ -277,15 +254,6 @@ mod test {
277254
assert_eq!(12u.cmp(-5), Greater);
278255
}
279256

280-
#[test]
281-
fn test_mut_int_totalord() {
282-
assert_eq!((&mut 5u).cmp(&10), Less);
283-
assert_eq!((&mut 10u).cmp(&5), Greater);
284-
assert_eq!((&mut 5u).cmp(&5), Equal);
285-
assert_eq!((&mut -5u).cmp(&12), Less);
286-
assert_eq!((&mut 12u).cmp(-5), Greater);
287-
}
288-
289257
#[test]
290258
fn test_ordering_order() {
291259
assert!(Less < Equal);

0 commit comments

Comments
 (0)