about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-02 09:22:37 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-02 09:22:37 -0800
commit9ca8076cb77a7d7738162c80e1d240ef2ad0b73a (patch)
tree59520fa9631a4dc8bb821fcd5d3ef67558809862
parent073fd5beab941a10e1fc199dc08373a7de0a7c39 (diff)
parentf9ce6f5ba458d6a3d4e63b282bac43a18e90aeb0 (diff)
downloadrust-9ca8076cb77a7d7738162c80e1d240ef2ad0b73a.tar.gz
rust-9ca8076cb77a7d7738162c80e1d240ef2ad0b73a.zip
rollup merge of #20386: frewsxcv/rm-reexports
Part of #19253

[breaking-change]
-rw-r--r--src/libcore/iter.rs6
-rw-r--r--src/libcoretest/iter.rs1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 7c53503b1ce..4a7a681255f 100644
--- 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
index d450e557383..7952c96a117 100644
--- 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;