Rollup merge of #95017 - zachs18:cmp_ordering_derive_eq, r=Dylan-DPC

Derive Eq for std::cmp::Ordering, instead of using manual impl.

This allows consts of type Ordering to be used in patterns, and with feature(adt_const_params) allows using `Ordering` as a const generic parameter.

Currently, `std::cmp::Ordering` implements `Eq` using a manually written `impl Eq for Ordering {}`, instead of `derive(Eq)`. This means that it does not implement `StructuralEq`.

This commit removes the manually written impl, and adds `derive(Eq)` to `Ordering`, so that it will implement `StructuralEq`.
This commit is contained in:
Matthias Krüger 2022-03-18 21:50:48 +01:00 committed by GitHub
commit 4ead6d9dc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions

View File

@ -333,7 +333,7 @@ pub struct AssertParamIsEq<T: Eq + ?Sized> {
/// let result = 2.cmp(&1);
/// assert_eq!(Ordering::Greater, result);
/// ```
#[derive(Clone, Copy, PartialEq, Debug, Hash)]
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
#[stable(feature = "rust1", since = "1.0.0")]
#[repr(i8)]
pub enum Ordering {
@ -861,9 +861,6 @@ pub macro Ord($item:item) {
/* compiler built-in */
}
#[stable(feature = "rust1", since = "1.0.0")]
impl Eq for Ordering {}
#[stable(feature = "rust1", since = "1.0.0")]
impl Ord for Ordering {
#[inline]

View File

@ -133,6 +133,19 @@ fn ordering_const() {
assert_eq!(THEN, Greater);
}
#[test]
fn ordering_structural_eq() {
// test that consts of type `Ordering` are usable in patterns
const ORDERING: Ordering = Greater;
const REVERSE: Ordering = ORDERING.reverse();
match Ordering::Less {
REVERSE => {}
_ => unreachable!(),
};
}
#[test]
fn cmp_default() {
// Test default methods in PartialOrd and PartialEq