mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 15:23:46 +00:00
Auto merge of #79656 - jnqnfe:ordering, r=sfackler
Add some core::cmp::Ordering helpers ...to allow easier equal-to-or-greater-than and less-than-or-equal-to comparisons. Prior to Rust 1.42 a greater-than-or-equal-to comparison might be written either as a match block, or a traditional conditional check like this: ```rust if cmp == Ordering::Equal || cmp == Ordering::Greater { // Do something } ``` Which requires two instances of `cmp`. Don't forget that while `cmp` here is very short, it could be something much longer in real use cases. From Rust 1.42 a nicer alternative is possible: ```rust if matches!(cmp, Ordering::Equal | Ordering::Greater) { // Do something } ``` The commit adds another alternative which may be even better in some cases: ```rust if cmp.is_equal_or_greater() { // Do something } ``` The earlier examples could be cleaner than they are if the variants of `Ordering` are imported such that `Equal`, `Greater` and `Less` can be referred to directly, but not everyone will want to do that. The new solution can shorten lines, help avoid logic mistakes, and avoids having to import `Ordering` / `Ordering::*`.
This commit is contained in:
commit
0c9ef564a7
@ -325,6 +325,120 @@ pub enum Ordering {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Ordering {
|
impl Ordering {
|
||||||
|
/// Returns `true` if the ordering is the `Equal` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_eq(), false);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_eq(), true);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_eq(), false);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_eq(self) -> bool {
|
||||||
|
matches!(self, Equal)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the ordering is not the `Equal` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_ne(), true);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_ne(), false);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_ne(), true);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_ne(self) -> bool {
|
||||||
|
!matches!(self, Equal)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the ordering is the `Less` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_lt(), true);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_lt(), false);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_lt(), false);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_lt(self) -> bool {
|
||||||
|
matches!(self, Less)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the ordering is the `Greater` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_gt(), false);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_gt(), false);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_gt(), true);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_gt(self) -> bool {
|
||||||
|
matches!(self, Greater)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the ordering is either the `Less` or `Equal` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_le(), true);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_le(), true);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_le(), false);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_le(self) -> bool {
|
||||||
|
!matches!(self, Greater)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the ordering is either the `Greater` or `Equal` variant.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(ordering_helpers)]
|
||||||
|
/// use std::cmp::Ordering;
|
||||||
|
///
|
||||||
|
/// assert_eq!(Ordering::Less.is_ge(), false);
|
||||||
|
/// assert_eq!(Ordering::Equal.is_ge(), true);
|
||||||
|
/// assert_eq!(Ordering::Greater.is_ge(), true);
|
||||||
|
/// ```
|
||||||
|
#[inline]
|
||||||
|
#[must_use]
|
||||||
|
#[unstable(feature = "ordering_helpers", issue = "79885")]
|
||||||
|
pub const fn is_ge(self) -> bool {
|
||||||
|
!matches!(self, Less)
|
||||||
|
}
|
||||||
|
|
||||||
/// Reverses the `Ordering`.
|
/// Reverses the `Ordering`.
|
||||||
///
|
///
|
||||||
/// * `Less` becomes `Greater`.
|
/// * `Less` becomes `Greater`.
|
||||||
|
Loading…
Reference in New Issue
Block a user