---

yaml
---
r: 60434
b: refs/heads/auto
c: f7e58eb
h: refs/heads/master
v: v3

Author: gifnksm

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 290a2ebab61282d89b211192679e84d22a01fd14
+refs/heads/auto: f7e58ebe84513ed65b1694311f8c4f35e53e8c0e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/iterator.rs

@@ -45,6 +45,7 @@ pub trait IteratorUtil<A> {
     fn advance(&mut self, f: &fn(A) -> bool);
     #[cfg(not(stage0))]
     fn advance(&mut self, f: &fn(A) -> bool) -> bool;
+    fn to_vec(self) -> ~[A];
 }
 
 /// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
@@ -131,6 +132,14 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
             }
         }
     }
+
+    #[inline(always)]
+    fn to_vec(self) -> ~[A] {
+        let mut v = ~[];
+        let mut it = self;
+        for it.advance() |x| { v.push(x); }
+        return v;
+    }
 }
 
 pub struct ChainIterator<T, U> {

branches/auto/src/libcore/util.rs

@@ -138,8 +138,8 @@ pub enum Void { }
 
 pub impl Void {
     /// A utility function for ignoring this uninhabited type
-    fn uninhabited(self) -> ! {
-        match self {
+    fn uninhabited(&self) -> ! {
+        match *self {
             // Nothing to match on
         }
     }
@@ -177,8 +177,7 @@ pub fn unreachable() -> ! {
 #[cfg(test)]
 mod tests {
     use option::{None, Some};
-    use util::{Void, NonCopyable, id, replace, swap};
-    use either::{Either, Left, Right};
+    use util::{NonCopyable, id, replace, swap};
 
     #[test]
     pub fn identity_crisis() {
@@ -203,12 +202,4 @@ mod tests {
         assert!(x.is_none());
         assert!(y.is_some());
     }
-    #[test]
-    pub fn test_uninhabited() {
-        let could_only_be_coin : Either <Void, ()> = Right (());
-        match could_only_be_coin {
-            Right (coin) => coin,
-            Left (is_void) => is_void.uninhabited ()
-        }
-    }
 }