Skip to content

Commit e99eeb5

Browse files
committed
auto merge of #16470 : liigo/rust/rename-private-cmp-macros, r=brson
eq_impl! => partial_eq_impl! totaleq_impl! => eq_impl! ord_impl! => partial_ord_impl! totalord_impl! => ord_impl!
2 parents 320c35e + 0186246 commit e99eeb5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/libcore/cmp.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ mod impls {
273273
Less, Greater, Equal};
274274
use option::{Option, Some, None};
275275

276-
macro_rules! eq_impl(
276+
macro_rules! partial_eq_impl(
277277
($($t:ty)*) => ($(
278278
#[unstable = "Trait is unstable."]
279279
impl PartialEq for $t {
@@ -293,18 +293,18 @@ mod impls {
293293
fn ne(&self, _other: &()) -> bool { false }
294294
}
295295

296-
eq_impl!(bool char uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64)
296+
partial_eq_impl!(bool char uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64)
297297

298-
macro_rules! totaleq_impl(
298+
macro_rules! eq_impl(
299299
($($t:ty)*) => ($(
300300
#[unstable = "Trait is unstable."]
301301
impl Eq for $t {}
302302
)*)
303303
)
304304

305-
totaleq_impl!(() bool char uint u8 u16 u32 u64 int i8 i16 i32 i64)
305+
eq_impl!(() bool char uint u8 u16 u32 u64 int i8 i16 i32 i64)
306306

307-
macro_rules! ord_impl(
307+
macro_rules! partial_ord_impl(
308308
($($t:ty)*) => ($(
309309
#[unstable = "Trait is unstable."]
310310
impl PartialOrd for $t {
@@ -345,9 +345,9 @@ mod impls {
345345
}
346346
}
347347

348-
ord_impl!(char uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64)
348+
partial_ord_impl!(char uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64)
349349

350-
macro_rules! totalord_impl(
350+
macro_rules! ord_impl(
351351
($($t:ty)*) => ($(
352352
#[unstable = "Trait is unstable."]
353353
impl Ord for $t {
@@ -375,7 +375,7 @@ mod impls {
375375
}
376376
}
377377

378-
totalord_impl!(char uint u8 u16 u32 u64 int i8 i16 i32 i64)
378+
ord_impl!(char uint u8 u16 u32 u64 int i8 i16 i32 i64)
379379

380380
// & pointers
381381
#[unstable = "Trait is unstable."]

0 commit comments

Comments
 (0)