X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibcore%2Fcmp.rs;h=3ea4baa57b49efb1acf3de276ced9d3e1150b07d;hb=6980f82c0d152446506fee4d4a45d8afdf4ad9a4;hp=0d4788dfc570b9d869910ae74f08bac079121a4e;hpb=a06baa56b95674fc626b3c3fd680d6a65357fe60;p=rust.git diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 0d4788dfc57..3ea4baa57b4 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -495,7 +495,7 @@ fn cmp(&self, other: &Reverse) -> Ordering { /// /// An order is a total order if it is (for all `a`, `b` and `c`): /// -/// - total and antisymmetric: exactly one of `a < b`, `a == b` or `a > b` is true; and +/// - total and asymmetric: exactly one of `a < b`, `a == b` or `a > b` is true; and /// - transitive, `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`. /// /// ## Derivable @@ -674,7 +674,7 @@ fn partial_cmp(&self, other: &Ordering) -> Option { /// /// The comparison must satisfy, for all `a`, `b` and `c`: /// -/// - antisymmetry: if `a < b` then `!(a > b)`, as well as `a > b` implying `!(a < b)`; and +/// - asymmetry: if `a < b` then `!(a > b)`, as well as `a > b` implying `!(a < b)`; and /// - transitivity: `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`. /// /// Note that these requirements mean that the trait itself must be implemented symmetrically and @@ -821,10 +821,7 @@ pub trait PartialOrd: PartialEq { #[must_use] #[stable(feature = "rust1", since = "1.0.0")] fn lt(&self, other: &Rhs) -> bool { - match self.partial_cmp(other) { - Some(Less) => true, - _ => false, - } + matches!(self.partial_cmp(other), Some(Less)) } /// This method tests less than or equal to (for `self` and `other`) and is used by the `<=` @@ -843,10 +840,7 @@ fn lt(&self, other: &Rhs) -> bool { #[must_use] #[stable(feature = "rust1", since = "1.0.0")] fn le(&self, other: &Rhs) -> bool { - match self.partial_cmp(other) { - Some(Less) | Some(Equal) => true, - _ => false, - } + matches!(self.partial_cmp(other), Some(Less) | Some(Equal)) } /// This method tests greater than (for `self` and `other`) and is used by the `>` operator. @@ -864,10 +858,7 @@ fn le(&self, other: &Rhs) -> bool { #[must_use] #[stable(feature = "rust1", since = "1.0.0")] fn gt(&self, other: &Rhs) -> bool { - match self.partial_cmp(other) { - Some(Greater) => true, - _ => false, - } + matches!(self.partial_cmp(other), Some(Greater)) } /// This method tests greater than or equal to (for `self` and `other`) and is used by the `>=` @@ -886,10 +877,7 @@ fn gt(&self, other: &Rhs) -> bool { #[must_use] #[stable(feature = "rust1", since = "1.0.0")] fn ge(&self, other: &Rhs) -> bool { - match self.partial_cmp(other) { - Some(Greater) | Some(Equal) => true, - _ => false, - } + matches!(self.partial_cmp(other), Some(Greater) | Some(Equal)) } }