rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Alias std::cmp::max/min to Ord::max/min

Browse Source
This commit is contained in:
Nick Whitney
2017-06-06 23:00:09 -04:00
parent 2cadc32b66
commit a32ffc6797
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcore/cmp.rs
View File

@@ -714,6 +714,8 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
/// ///
/// Returns the first argument if the comparison determines them to be equal. /// Returns the first argument if the comparison determines them to be equal.
/// ///
/// Internally uses an alias to `Ord::min`.
///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
@@ -725,13 +727,15 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
#[inline] #[inline]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn min<T: Ord>(v1: T, v2: T) -> T { pub fn min<T: Ord>(v1: T, v2: T) -> T {
if v1 <= v2 { v1 } else { v2 } v1.min(v2)
} }
/// Compares and returns the maximum of two values. /// Compares and returns the maximum of two values.
/// ///
/// Returns the second argument if the comparison determines them to be equal. /// Returns the second argument if the comparison determines them to be equal.
/// ///
/// Internally uses an alias to `Ord::max`.
///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
@@ -743,7 +747,7 @@ pub fn min<T: Ord>(v1: T, v2: T) -> T {
#[inline] #[inline]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn max<T: Ord>(v1: T, v2: T) -> T { pub fn max<T: Ord>(v1: T, v2: T) -> T {
if v2 >= v1 { v2 } else { v1 } v1.max(v2)
} }
// Implementation of PartialEq, Eq, PartialOrd and Ord for primitive types // Implementation of PartialEq, Eq, PartialOrd and Ord for primitive types