rollup merge of #20386: frewsxcv/rm-reexports

Part of #19253

[breaking-change]
This commit is contained in:
Alex Crichton 2015-01-02 09:22:37 -08:00
commit 9ca8076cb7
2 changed files with 4 additions and 3 deletions

View File

@ -54,7 +54,7 @@
//! //!
//! This `for` loop syntax can be applied to any iterator over any type. //! This `for` loop syntax can be applied to any iterator over any type.
pub use self::MinMaxResult::*; use self::MinMaxResult::*;
use clone::Clone; use clone::Clone;
use cmp; use cmp;
@ -1035,7 +1035,7 @@ pub trait IteratorOrdExt<A> {
/// # Example /// # Example
/// ///
/// ```rust /// ```rust
/// use std::iter::{NoElements, OneElement, MinMax}; /// use std::iter::MinMaxResult::{NoElements, OneElement, MinMax};
/// ///
/// let v: [int; 0] = []; /// let v: [int; 0] = [];
/// assert_eq!(v.iter().min_max(), NoElements); /// assert_eq!(v.iter().min_max(), NoElements);
@ -1145,7 +1145,7 @@ impl<T: Clone> MinMaxResult<T> {
/// # Example /// # Example
/// ///
/// ```rust /// ```rust
/// use std::iter::{NoElements, OneElement, MinMax, MinMaxResult}; /// use std::iter::MinMaxResult::{mod, NoElements, OneElement, MinMax};
/// ///
/// let r: MinMaxResult<int> = NoElements; /// let r: MinMaxResult<int> = NoElements;
/// assert_eq!(r.into_option(), None); /// assert_eq!(r.into_option(), None);

View File

@ -10,6 +10,7 @@
use core::iter::*; use core::iter::*;
use core::iter::order::*; use core::iter::order::*;
use core::iter::MinMaxResult::*;
use core::num::SignedInt; use core::num::SignedInt;
use core::uint; use core::uint;
use core::cmp; use core::cmp;