---

yaml
---
r: 151395
b: refs/heads/try2
c: b024ba5
h: refs/heads/master
i:
  151393: 504b46c
  151391: e629079
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 06fcb6b1c81f1f5190d431c169cd0c725fecf18e
+refs/heads/try2: b024ba544c8cf831423cdd24d2dc516d66dc6269
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/iter.rs renamed to branches/try2/src/libcore/iter.rs

@@ -969,7 +969,7 @@ impl<A: TotalOrd, T: Iterator<A>> OrdIterator<A> for T {
 }
 
 /// `MinMaxResult` is an enum returned by `min_max`. See `OrdIterator::min_max` for more detail.
-#[deriving(Clone, Eq, Show)]
+#[deriving(Clone, Eq)]
 pub enum MinMaxResult<T> {
     /// Empty iterator
     NoElements,

branches/try2/src/libcore/lib.rs

@@ -43,6 +43,7 @@ mod unit;
 pub mod any;
 pub mod bool;
 pub mod finally;
+pub mod iter;
 pub mod option;
 pub mod raw;
 pub mod char;

branches/try2/src/libstd/fmt/mod.rs

@@ -489,6 +489,7 @@ use char::Char;
 use container::Container;
 use io::MemWriter;
 use io;
+use iter;
 use iter::{Iterator, range};
 use num::Signed;
 use option::{Option,Some,None};
@@ -1301,5 +1302,18 @@ impl Show for TypeId {
     }
 }
 
+impl<T: Show> Show for iter::MinMaxResult<T> {
+    fn fmt(&self, f: &mut Formatter) -> Result {
+        match *self {
+            iter::NoElements =>
+                write!(f.buf, "NoElements"),
+            iter::OneElement(ref t) =>
+                write!(f.buf, "OneElement({})", *t),
+            iter::MinMax(ref t1, ref t2) =>
+                write!(f.buf, "MinMax({}, {})", *t1, *t2),
+        }
+    }
+}
+
 // If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
 // it's a lot easier than creating all of the rt::Piece structures here.

branches/try2/src/libstd/lib.rs

@@ -145,6 +145,7 @@ pub use core::clone;
 pub use core::container;
 pub use core::default;
 pub use core::intrinsics;
+pub use core::iter;
 pub use core::mem;
 pub use core::option;
 pub use core::ptr;
@@ -217,7 +218,6 @@ pub mod gc;
 
 pub mod from_str;
 pub mod num;
-pub mod iter;
 pub mod to_str;
 pub mod hash;