rollup merge of rust-lang#20386: frewsxcv/rm-reexports

Part of rust-lang#19253 [breaking-change]
alexcrichton · Jan 2, 2015 · 9ca8076 · 9ca8076
2 parents 073fd5b + f9ce6f5
commit 9ca8076
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
@@ -54,7 +54,7 @@
 //!
 //! This `for` loop syntax can be applied to any iterator over any type.
 
-pub use self::MinMaxResult::*;
+use self::MinMaxResult::*;
 
 use clone::Clone;
 use cmp;
@@ -1035,7 +1035,7 @@ pub trait IteratorOrdExt<A> {
     /// # Example
     ///
     /// ```rust
-    /// use std::iter::{NoElements, OneElement, MinMax};
+    /// use std::iter::MinMaxResult::{NoElements, OneElement, MinMax};
     ///
     /// let v: [int; 0] = [];
     /// assert_eq!(v.iter().min_max(), NoElements);
@@ -1145,7 +1145,7 @@ impl<T: Clone> MinMaxResult<T> {
     /// # Example
     ///
     /// ```rust
-    /// use std::iter::{NoElements, OneElement, MinMax, MinMaxResult};
+    /// use std::iter::MinMaxResult::{mod, NoElements, OneElement, MinMax};
     ///
     /// let r: MinMaxResult<int> = NoElements;
     /// assert_eq!(r.into_option(), None);

diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs
@@ -10,6 +10,7 @@
 
 use core::iter::*;
 use core::iter::order::*;
+use core::iter::MinMaxResult::*;
 use core::num::SignedInt;
 use core::uint;
 use core::cmp;