mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #44593 - budziq:stabilize_ord_max_min, r=alexcrichton

Browse Source 
stabilized ord_max_min (fixes #25663)
This commit is contained in:
Alex Crichton 2017-09-16 09:16:59 -05:00
commit 3cc135afa3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcore/cmp.rs
View File

@ -453,12 +453,10 @@ pub trait Ord: Eq + PartialOrd<Self> {
/// # Examples
///
/// ```
/// #![feature(ord_max_min)]
///
/// assert_eq!(2, 1.max(2));
/// assert_eq!(2, 2.max(2));
/// ```
#[unstable(feature = "ord_max_min", issue = "25663")]
#[stable(feature = "ord_max_min", since = "1.22.0")]
fn max(self, other: Self) -> Self
where Self: Sized {
if other >= self { other } else { self }
@ -471,12 +469,10 @@ fn max(self, other: Self) -> Self
/// # Examples
///
/// ```
/// #![feature(ord_max_min)]
///
/// assert_eq!(1, 1.min(2));
/// assert_eq!(2, 2.min(2));
/// ```
#[unstable(feature = "ord_max_min", issue = "25663")]
#[stable(feature = "ord_max_min", since = "1.22.0")]
fn min(self, other: Self) -> Self
where Self: Sized {
if self <= other { self } else { other }

1
src/libcore/tests/lib.rs
View File

@ -26,7 +26,6 @@
#![feature(inclusive_range_syntax)]
#![feature(iter_rfind)]
#![feature(nonzero)]
#![feature(ord_max_min)]
#![feature(rand)]
#![feature(raw)]
#![feature(refcell_replace_swap)]