Skip to content

Commit 84a2d66

Browse files
authored
Rollup merge of #66779 - guanqun:reorder-funcs, r=Dylan-DPC
follow the same function order in the trait With this change, the function order in both traits and implementation matches. And this fix removes several warnings in IDE.
2 parents 339d717 + 55d7258 commit 84a2d66

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/libcore/cmp.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ impl<T: PartialOrd> PartialOrd for Reverse<T> {
464464
#[inline]
465465
fn le(&self, other: &Self) -> bool { other.0 <= self.0 }
466466
#[inline]
467-
fn ge(&self, other: &Self) -> bool { other.0 >= self.0 }
468-
#[inline]
469467
fn gt(&self, other: &Self) -> bool { other.0 > self.0 }
468+
#[inline]
469+
fn ge(&self, other: &Self) -> bool { other.0 >= self.0 }
470470
}
471471

472472
#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
@@ -1176,9 +1176,9 @@ mod impls {
11761176
#[inline]
11771177
fn le(&self, other: & &B) -> bool { PartialOrd::le(*self, *other) }
11781178
#[inline]
1179-
fn ge(&self, other: & &B) -> bool { PartialOrd::ge(*self, *other) }
1180-
#[inline]
11811179
fn gt(&self, other: & &B) -> bool { PartialOrd::gt(*self, *other) }
1180+
#[inline]
1181+
fn ge(&self, other: & &B) -> bool { PartialOrd::ge(*self, *other) }
11821182
}
11831183
#[stable(feature = "rust1", since = "1.0.0")]
11841184
impl<A: ?Sized> Ord for &A where A: Ord {
@@ -1208,9 +1208,9 @@ mod impls {
12081208
#[inline]
12091209
fn le(&self, other: &&mut B) -> bool { PartialOrd::le(*self, *other) }
12101210
#[inline]
1211-
fn ge(&self, other: &&mut B) -> bool { PartialOrd::ge(*self, *other) }
1212-
#[inline]
12131211
fn gt(&self, other: &&mut B) -> bool { PartialOrd::gt(*self, *other) }
1212+
#[inline]
1213+
fn ge(&self, other: &&mut B) -> bool { PartialOrd::ge(*self, *other) }
12141214
}
12151215
#[stable(feature = "rust1", since = "1.0.0")]
12161216
impl<A: ?Sized> Ord for &mut A where A: Ord {

0 commit comments

Comments
 (0)