Rollup merge of #45171 - rust-lang:petrochenkov-patch-2, r=steveklabnik

[rust.git] / src / test / run-pass / minmax-stability-issue-23687.rs

diff --git a/src/test/run-pass/minmax-stability-issue-23687.rs b/src/test/run-pass/minmax-stability-issue-23687.rs
index 86dd1a04532b47b83b9e0a542117e9eaeb3df58f..ba48648df32fb04255bb77d04f663484c6f534e1 100644 (file)
--- a/src/test/run-pass/minmax-stability-issue-23687.rs
+++ b/src/test/run-pass/minmax-stability-issue-23687.rs
@@ -8,10 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(core)]
 use std::fmt::Debug;
 use std::cmp::{self, PartialOrd, Ordering};
-use std::iter::MinMaxResult::MinMax;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 struct Foo {
@@ -43,24 +41,15 @@ fn main() {
 
     // `min` should return the left when the values are equal
     assert_eq!(data.iter().min(), Some(&a));
-    assert_eq!(data.iter().min_by(|a| a.n), Some(&a));
+    assert_eq!(data.iter().min_by_key(|a| a.n), Some(&a));
     assert_eq!(cmp::min(a, b), a);
     assert_eq!(cmp::min(b, a), b);
-    assert_eq!(cmp::partial_min(a, b), Some(a));
-    assert_eq!(cmp::partial_min(b, a), Some(b));
 
     // `max` should return the right when the values are equal
     assert_eq!(data.iter().max(), Some(&f));
-    assert_eq!(data.iter().max_by(|a| a.n), Some(&f));
+    assert_eq!(data.iter().max_by_key(|a| a.n), Some(&f));
     assert_eq!(cmp::max(e, f), f);
     assert_eq!(cmp::max(f, e), e);
-    assert_eq!(cmp::partial_max(e, f), Some(f));
-    assert_eq!(cmp::partial_max(f, e), Some(e));
-
-    // Similar for `min_max`
-    assert_eq!(data.iter().min_max(), MinMax(&a, &f));
-    assert_eq!(data[1..5].iter().min_max(), MinMax(&b, &e));
-    assert_eq!(data[2..4].iter().min_max(), MinMax(&c, &d));
 
     let mut presorted = data.to_vec();
     presorted.sort();