---

yaml
---
r: 141022
b: refs/heads/try2
c: 20ef423
h: refs/heads/master
v: v3

Author: thestinger

[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: ccf6353fd56dc9cbeebe335332f0e5758117c658
+refs/heads/try2: 20ef4238bb63686d5af951acfba5468959be861d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/compiletest/compiletest.rc

@@ -12,7 +12,7 @@
 
 #[allow(non_camel_case_types)];
 
-extern mod std(vers = "0.7-pre");
+extern mod std;
 
 use core::*;
 

branches/try2/src/driver/driver.rs

@@ -9,21 +9,21 @@
 // except according to those terms.
 
 #[cfg(rustpkg)]
-extern mod this(name = "rustpkg", vers = "0.7-pre");
+extern mod this(name = "rustpkg");
 
 #[cfg(fuzzer)]
-extern mod this(name = "fuzzer", vers = "0.7-pre");
+extern mod this(name = "fuzzer");
 
 #[cfg(rustdoc)]
-extern mod this(name = "rustdoc", vers = "0.7-pre");
+extern mod this(name = "rustdoc");
 
 #[cfg(rusti)]
-extern mod this(name = "rusti", vers = "0.7-pre");
+extern mod this(name = "rusti");
 
 #[cfg(rust)]
-extern mod this(name = "rust", vers = "0.7-pre");
+extern mod this(name = "rust");
 
 #[cfg(rustc)]
-extern mod this(name = "rustc", vers = "0.7-pre");
+extern mod this(name = "rustc");
 
 fn main() { this::main() }

branches/try2/src/libcore/core.rc

@@ -63,7 +63,7 @@ they contained the following prologue:
 #[deny(non_camel_case_types)];
 
 // Make core testable by not duplicating lang items. See #2912
-#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre");
+#[cfg(test)] extern mod realcore(name = "core");
 #[cfg(test)] pub use kinds = realcore::kinds;
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;

branches/try2/src/libcore/iterator.rs

@@ -47,10 +47,10 @@ pub trait IteratorUtil<A> {
     fn advance(&mut self, f: &fn(A) -> bool);
     #[cfg(not(stage0))]
     fn advance(&mut self, f: &fn(A) -> bool) -> bool;
-    #[cfg(not(stage0))]
-    fn to_vec(&mut self) -> ~[A];
-    fn nth(&mut self, n: uint) -> Option<A>;
-    fn last(&mut self) -> Option<A>;
+    fn to_vec(self) -> ~[A];
+    fn nth(&mut self, n: uint) -> A;
+    fn first(&mut self) -> A;
+    fn last(&mut self) -> A;
     fn fold<B>(&mut self, start: B, f: &fn(B, A) -> B) -> B;
     fn count(&mut self) -> uint;
     fn all(&mut self, f: &fn(&A) -> bool) -> bool;
@@ -147,30 +147,47 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
         }
     }
 
-    #[cfg(not(stage0))]
     #[inline(always)]
-    fn to_vec(&mut self) -> ~[A] {
-        iter::to_vec::<A>(|f| self.advance(f))
+    fn to_vec(self) -> ~[A] {
+        let mut v = ~[];
+        let mut it = self;
+        for it.advance() |x| { v.push(x); }
+        return v;
     }
 
-    /// Return the `n`th item yielded by an iterator.
+    /// Get `n`th element of an iterator.
     #[inline(always)]
-    fn nth(&mut self, mut n: uint) -> Option<A> {
+    fn nth(&mut self, n: uint) -> A {
+        let mut i = n;
         loop {
             match self.next() {
-                Some(x) => if n == 0 { return Some(x) },
-                None => return None
+                Some(x) => { if i == 0 { return x; }}
+                None => { fail!("cannot get %uth element", n) }
             }
-            n -= 1;
+            i -= 1;
         }
     }
 
-    /// Return the last item yielded by an iterator.
+    // Get first elemet of an iterator.
     #[inline(always)]
-    fn last(&mut self) -> Option<A> {
-        let mut last = None;
-        for self.advance |x| { last = Some(x); }
-        last
+    fn first(&mut self) -> A {
+        match self.next() {
+            Some(x) => x ,
+            None => fail!("cannot get first element")
+        }
+    }
+
+    // Get last element of an iterator.
+    //
+    // If the iterator have an infinite length, this method won't return.
+    #[inline(always)]
+    fn last(&mut self) -> A {
+        let mut elm = match self.next() {
+            Some(x) => x,
+            None    => fail!("cannot get last element")
+        };
+        for self.advance |e| { elm = e; }
+        return elm;
     }
 
     /// Reduce an iterator to an accumulated value
@@ -186,7 +203,7 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
         return accum;
     }
 
-    /// Count the number of items yielded by an iterator
+    /// Count the number of an iterator elemenrs
     #[inline(always)]
     fn count(&mut self) -> uint { self.fold(0, |cnt, _x| cnt + 1) }
 
@@ -327,13 +344,17 @@ pub struct FilterMapIterator<'self, A, B, T> {
 impl<'self, A, B, T: Iterator<A>> Iterator<B> for FilterMapIterator<'self, A, B, T> {
     #[inline]
     fn next(&mut self) -> Option<B> {
-        for self.iter.advance |x| {
-            match (self.f)(x) {
-                Some(y) => return Some(y),
-                None => ()
+        loop {
+            match self.iter.next() {
+                None    => { return None; }
+                Some(a) => {
+                    match (self.f)(a) {
+                        Some(b) => { return Some(b); }
+                        None    => { loop; }
+                    }
+                }
             }
         }
-        None
     }
 }
 
@@ -558,7 +579,7 @@ mod tests {
 
     #[test]
     fn test_filter_map() {
-        let mut it = Counter::new(0u, 1u).take(10)
+        let it  = Counter::new(0u, 1u).take(10)
             .filter_map(|x: uint| if x.is_even() { Some(x*x) } else { None });
         assert_eq!(it.to_vec(), ~[0*0, 2*2, 4*4, 6*6, 8*8]);
     }
@@ -668,15 +689,43 @@ mod tests {
     fn test_iterator_nth() {
         let v = &[0, 1, 2, 3, 4];
         for uint::range(0, v.len()) |i| {
-            assert_eq!(v.iter().nth(i).unwrap(), &v[i]);
+            assert_eq!(v.iter().nth(i), &v[i]);
         }
     }
 
+    #[test]
+    #[should_fail]
+    fn test_iterator_nth_fail() {
+        let v = &[0, 1, 2, 3, 4];
+        v.iter().nth(5);
+    }
+
+    #[test]
+    fn test_iterator_first() {
+        let v = &[0, 1, 2, 3, 4];
+        assert_eq!(v.iter().first(), &0);
+        assert_eq!(v.slice(2, 5).iter().first(), &2);
+    }
+
+    #[test]
+    #[should_fail]
+    fn test_iterator_first_fail() {
+        let v: &[uint] = &[];
+        v.iter().first();
+    }
+
     #[test]
     fn test_iterator_last() {
         let v = &[0, 1, 2, 3, 4];
-        assert_eq!(v.iter().last().unwrap(), &4);
-        assert_eq!(v.slice(0, 1).iter().last().unwrap(), &0);
+        assert_eq!(v.iter().last(), &4);
+        assert_eq!(v.slice(0, 1).iter().last(), &0);
+    }
+
+    #[test]
+    #[should_fail]
+    fn test_iterator_last_fail() {
+        let v: &[uint] = &[];
+        v.iter().last();
     }
 
     #[test]

branches/try2/src/libfuzzer/fuzzer.rc

@@ -20,8 +20,8 @@
 
 #[allow(non_camel_case_types)];
 
-extern mod std(vers = "0.7-pre");
-extern mod syntax(vers = "0.7-pre");
+extern mod std;
+extern mod syntax;
 
 use core::run;
 

branches/try2/src/librust/rust.rc

@@ -20,10 +20,10 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-extern mod rustpkg(vers = "0.7-pre");
-extern mod rustdoc(vers = "0.7-pre");
-extern mod rusti(vers = "0.7-pre");
-extern mod rustc(vers = "0.7-pre");
+extern mod rustpkg;
+extern mod rustdoc;
+extern mod rusti;
+extern mod rustc;
 
 use core::run;
 

branches/try2/src/librustc/rustc.rc

@@ -21,9 +21,8 @@
 #[allow(non_camel_case_types)];
 #[deny(deprecated_pattern)];
 
-extern mod std(vers = "0.7-pre");
-extern mod syntax(vers = "0.7-pre");
-
+extern mod std;
+extern mod syntax;
 
 use driver::driver::{host_triple, optgroups, early_error};
 use driver::driver::{str_input, file_input, build_session_options};

branches/try2/src/librustdoc/rustdoc.rc

@@ -21,9 +21,9 @@
 
 #[allow(non_implicitly_copyable_typarams)];
 
-extern mod std(vers = "0.7-pre");
-extern mod rustc(vers = "0.7-pre");
-extern mod syntax(vers = "0.7-pre");
+extern mod std;
+extern mod rustc;
+extern mod syntax;
 
 use config::Config;
 use doc::Item;

branches/try2/src/librusti/rusti.rc

@@ -18,9 +18,9 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-extern mod std(vers = "0.7-pre");
-extern mod rustc(vers = "0.7-pre");
-extern mod syntax(vers = "0.7-pre");
+extern mod std;
+extern mod rustc;
+extern mod syntax;
 
 use core::*;
 use core::cell::Cell;

branches/try2/src/librustpkg/rustpkg.rc

@@ -18,9 +18,9 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-extern mod std(vers = "0.7-pre");
-extern mod rustc(vers = "0.7-pre");
-extern mod syntax(vers = "0.7-pre");
+extern mod std;
+extern mod rustc;
+extern mod syntax;
 
 use core::*;
 pub use core::path::Path;

branches/try2/src/libsyntax/syntax.rc

@@ -23,7 +23,7 @@
 #[allow(non_camel_case_types)];
 #[deny(deprecated_pattern)];
 
-extern mod std(vers = "0.7-pre");
+extern mod std;
 
 // allow the interner_key macro
 // to escape this module: