---

yaml
---
r: 102335
b: refs/heads/master
c: 062e950
h: refs/heads/master
i:
  102333: 27077e3
  102331: 1140b55
  102327: c00abca
  102319: c970c1a
  102303: e0dbb90
  102271: 9aa51b1
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 47cff94ab9b80d09753bc18bd305ee87493add2b
+refs/heads/master: 062e950ae82e60a36833255b48b5e7b124179634
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/librustc/front/test.rs

@@ -313,12 +313,6 @@ fn mk_std(cx: &TestCtxt) -> ast::ViewItem {
     }
 }
 
-#[cfg(stage0)]
-fn mk_test_module(_: &TestCtxt) -> @ast::Item {
-    fail!("test disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
     // Link to test crate
     let view_items = vec!(mk_std(cx));
@@ -388,12 +382,6 @@ fn path_node_global(ids: ~[ast::Ident]) -> ast::Path {
     }
 }
 
-#[cfg(stage0)]
-fn mk_tests(_: &TestCtxt) -> @ast::Item {
-    fail!("tests disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_tests(cx: &TestCtxt) -> @ast::Item {
     // The vector of test_descs for this crate
     let test_descs = mk_test_descs(cx);
@@ -435,12 +423,6 @@ fn mk_test_descs(cx: &TestCtxt) -> @ast::Expr {
     }
 }
 
-#[cfg(stage0)]
-fn mk_test_desc_and_fn_rec(_: &TestCtxt, _: &Test) -> @ast::Expr {
-    fail!("tests disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_test_desc_and_fn_rec(cx: &TestCtxt, test: &Test) -> @ast::Expr {
     let span = test.span;
     let path = test.path.clone();

trunk/src/libstd/vec_ng.rs

@@ -17,11 +17,11 @@ use cmp::{Eq, Ordering, TotalEq, TotalOrd};
 use container::Container;
 use default::Default;
 use fmt;
-use iter::{DoubleEndedIterator, FromIterator, Iterator};
+use iter::{DoubleEndedIterator, FromIterator, Extendable, Iterator};
 use libc::{free, c_void};
 use mem::{size_of, move_val_init};
 use num;
-use num::CheckedMul;
+use num::{CheckedMul, CheckedAdd};
 use ops::Drop;
 use option::{None, Option, Some};
 use ptr::RawPtr;
@@ -126,6 +126,16 @@ impl<T> FromIterator<T> for Vec<T> {
     }
 }
 
+impl<T> Extendable<T> for Vec<T> {
+    fn extend<I: Iterator<T>>(&mut self, iterator: &mut I) {
+        let (lower, _) = iterator.size_hint();
+        self.reserve_additional(lower);
+        for element in *iterator {
+            self.push(element)
+        }
+    }
+}
+
 impl<T:Eq> Eq for Vec<T> {
     #[inline]
     fn eq(&self, other: &Vec<T>) -> bool {
@@ -160,6 +170,15 @@ impl<T> Vec<T> {
         self.cap
     }
 
+    pub fn reserve_additional(&mut self, extra: uint) {
+        if self.cap - self.len < extra {
+            match self.len.checked_add(&extra) {
+                None => fail!("Vec::reserve_additional: `uint` overflow"),
+                Some(new_cap) => self.reserve(new_cap)
+            }
+        }
+    }
+
     pub fn reserve(&mut self, capacity: uint) {
         if capacity >= self.len {
             self.reserve_exact(num::next_power_of_two(capacity))
@@ -453,3 +472,48 @@ impl<T> Drop for MoveItems<T> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Vec;
+    use iter::{Iterator, range, Extendable};
+    use option::{Some, None};
+
+    #[test]
+    fn test_reserve_additional() {
+        let mut v = Vec::new();
+        assert_eq!(v.capacity(), 0);
+
+        v.reserve_additional(2);
+        assert!(v.capacity() >= 2);
+
+        for i in range(0, 16) {
+            v.push(i);
+        }
+
+        assert!(v.capacity() >= 16);
+        v.reserve_additional(16);
+        assert!(v.capacity() >= 32);
+
+        v.push(16);
+
+        v.reserve_additional(16);
+        assert!(v.capacity() >= 33)
+    }
+
+    #[test]
+    fn test_extend() {
+        let mut v = Vec::new();
+        let mut w = Vec::new();
+
+        v.extend(&mut range(0, 3));
+        for i in range(0, 3) { w.push(i) }
+
+        assert_eq!(v, w);
+
+        v.extend(&mut range(3, 10));
+        for i in range(3, 10) { w.push(i) }
+
+        assert_eq!(v, w);
+    }
+}

trunk/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2014-03-03 6e7f170
+  freebsd-x86_64 1afdfbb838af95cea5d5037018f220356da954f6
+  linux-i386 edd73d291614907ad502a9f726cd9facb1f2f49f
+  linux-x86_64 6b4d38bde52db482e5d41cc3fe06f777646930dd
+  macos-i386 ac4e833996a92f94bff8955035ff4cea92bb11de
+  macos-x86_64 2ba2903243c7dc31c80305af0b9f9a30b159797a
+  winnt-i386 e64d3d670f11f48b487024bd3a6838c1d23a7483
+
 S 2014-02-22 4995a85
   freebsd-x86_64 0d8e2577d4b626cd8a5d9c29f0f91a4452bc1621
   linux-i386 afadce8cba1098b1b9ae1e53a649c1515cd26e3c

trunk/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

@@ -12,6 +12,7 @@
 // ignore-stage1
 // ignore-fast
 // ignore-android
+// ignore-cross-compile #12102
 
 #[feature(phase)];
 

trunk/src/test/run-pass-fulldeps/macro-crate.rs

@@ -12,6 +12,7 @@
 // ignore-stage1
 // ignore-fast
 // ignore-android
+// ignore-cross-compile #12102
 
 #[feature(phase)];