---

yaml
---
r: 71927
b: refs/heads/dist-snap
c: 2f8b36f
h: refs/heads/master
i:
  71925: 6d86d24
  71923: 2388535
  71919: d80959c
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: aff558998ef98b4c80cace32538ba23ee67a4d6d
+refs/heads/dist-snap: 2f8b36fc16178b298b23dfa199067ec2dd91df93
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/compiletest/compiletest.rc

@@ -17,8 +17,8 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.7-rc");
-extern mod std(vers = "0.7-rc");
+extern mod core(vers = "0.7-pre");
+extern mod std(vers = "0.7-pre");
 
 use core::*;
 

branches/dist-snap/src/driver/driver.rs

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

branches/dist-snap/src/etc/kate/rust.xml

@@ -7,7 +7,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="0.7-rc" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.7-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/dist-snap/src/libcore/core.rc

@@ -48,7 +48,7 @@ they contained the following prologue:
 
 
 #[link(name = "core",
-       vers = "0.7-rc",
+       vers = "0.7-pre",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
 
@@ -66,7 +66,7 @@ they contained the following prologue:
 #[allow(deprecated_drop)];
 
 // Make core testable by not duplicating lang items. See #2912
-#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-rc");
+#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre");
 #[cfg(test)] pub use kinds = realcore::kinds;
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;

branches/dist-snap/src/libcore/iter.rs

@@ -344,3 +344,29 @@ pub fn copy_seq<T:Copy,IT:BaseIter<T>,BT:Buildable<T>>(v: &IT) -> BT {
         for v.each |x| { push(*x); }
     }
 }
+
+/**
+ * Helper function to transform an internal iterator into an owned vector.
+ *
+ * # Example:
+ *
+ * ~~~
+ * let v = ~[1, 2, 3];
+ * let v2 = do iter_to_vec |f| { v.each(|e| f(*e)) };
+ * if v != v2 { fail!() }
+ * ~~~
+ */
+#[inline(always)]
+pub fn iter_to_vec<T>(pusher: &fn(it: &fn(T) -> bool)) -> ~[T] {
+    let mut v = ~[];
+    let pushf = |e| {v.push(e); true};
+    pusher(pushf);
+    v
+}
+
+#[test]
+fn test_iter_to_vec() {
+    let v = ~[1, 2, 3];
+    let v2 = do iter_to_vec |f| { v.each(|e| f(*e)) };
+    if v != v2 { fail!() }
+}

branches/dist-snap/src/libcore/rand.rs

@@ -150,21 +150,7 @@ pub struct Weighted<T> {
 
 pub trait RngUtil {
     fn gen<T:Rand>(&self) -> T;
-    /**
-     * Return a random int
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%d",rng.gen_int()));
-     * }
-     * ~~~
-     */
+    /// Return a random int
     fn gen_int(&self) -> int;
     fn gen_int_range(&self, start: int, end: int) -> int;
     /// Return a random i8
@@ -190,21 +176,7 @@ pub trait RngUtil {
     fn gen_u32(&self) -> u32;
     /// Return a random u64
     fn gen_u64(&self) -> u64;
-    /**
-     * Return random float in the interval [0,1]
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%f",rng.gen_float()));
-     * }
-     * ~~~
-     */
+    /// Return a random float in the interval [0,1]
     fn gen_float(&self) -> float;
     /// Return a random f32 in the interval [0,1]
     fn gen_f32(&self) -> f32;
@@ -216,184 +188,38 @@ pub trait RngUtil {
      * Return a char randomly chosen from chars, failing if chars is empty
      */
     fn gen_char_from(&self, chars: &str) -> char;
-    /**
-     * Return a random bool
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%b",rng.gen_bool()));
-     * }
-     * ~~~
-     */
+    /// Return a random bool
     fn gen_bool(&self) -> bool;
-    /**
-     * Return a bool with a 1 in n chance of true
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%b",rng.gen_weighted_bool(3)));
-     * }
-     * ~~~
-     */
+    /// Return a bool with a 1 in n chance of true
     fn gen_weighted_bool(&self, n: uint) -> bool;
     /**
      * Return a random string of the specified length composed of A-Z,a-z,0-9
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(rng.gen_str(8));
-     * }
-     * ~~~
      */
     fn gen_str(&self, len: uint) -> ~str;
-    /**
-     * Return a random byte string of the specified length
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%?",rng.gen_bytes(8)));
-     * }
-     * ~~~
-     */
+    /// Return a random byte string of the specified length
     fn gen_bytes(&self, len: uint) -> ~[u8];
-    ///
-    /**
-     * Choose an item randomly, failing if values is empty
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%d",rng.choose([1,2,4,8,16,32])));
-     * }
-     * ~~~
-     */
+    /// Choose an item randomly, failing if values is empty
     fn choose<T:Copy>(&self, values: &[T]) -> T;
     /// Choose Some(item) randomly, returning None if values is empty
     fn choose_option<T:Copy>(&self, values: &[T]) -> Option<T>;
     /**
      * Choose an item respecting the relative weights, failing if the sum of
      * the weights is 0
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     let x = [rand::Weighted {weight: 4, item: 'a'},
-     *              rand::Weighted {weight: 2, item: 'b'},
-     *              rand::Weighted {weight: 2, item: 'c'}];
-     *     println(fmt!("%c",rng.choose_weighted(x)));
-     * }
-     * ~~~
      */
     fn choose_weighted<T:Copy>(&self, v : &[Weighted<T>]) -> T;
     /**
      * Choose Some(item) respecting the relative weights, returning none if
      * the sum of the weights is 0
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     let x = [rand::Weighted {weight: 4, item: 'a'},
-     *              rand::Weighted {weight: 2, item: 'b'},
-     *              rand::Weighted {weight: 2, item: 'c'}];
-     *     println(fmt!("%?",rng.choose_weighted_option(x)));
-     * }
-     * ~~~
      */
     fn choose_weighted_option<T:Copy>(&self, v: &[Weighted<T>]) -> Option<T>;
     /**
      * Return a vec containing copies of the items, in order, where
      * the weight of the item determines how many copies there are
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     let x = [rand::Weighted {weight: 4, item: 'a'},
-     *              rand::Weighted {weight: 2, item: 'b'},
-     *              rand::Weighted {weight: 2, item: 'c'}];
-     *     println(fmt!("%?",rng.weighted_vec(x)));
-     * }
-     * ~~~
      */
     fn weighted_vec<T:Copy>(&self, v: &[Weighted<T>]) -> ~[T];
-    /**
-     * Shuffle a vec
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     println(fmt!("%?",rng.shuffle([1,2,3])));
-     * }
-     * ~~~
-     */
+    /// Shuffle a vec
     fn shuffle<T:Copy>(&self, values: &[T]) -> ~[T];
-    /**
-     * Shuffle a mutable vec in place
-     *
-     * *Example*
-     *
-     * ~~~
-     *
-     * use core::rand::RngUtil;
-     *
-     * fn main() {
-     *     rng = rand::Rng();
-     *     let mut y = [1,2,3];
-     *     rng.shuffle_mut(y);
-     *     println(fmt!("%?",y));
-     *     rng.shuffle_mut(y);
-     *     println(fmt!("%?",y));
-     * }
-     * ~~~
-     */
+    /// Shuffle a mutable vec in place
     fn shuffle_mut<T>(&self, values: &mut [T]);
 }
 
@@ -511,7 +337,7 @@ impl RngUtil for @Rng {
         self.next() & 1u32 == 1u32
     }
 
-    /// Return a bool with a 1-in-n chance of true
+    /// Return a bool with a 1 in n chance of true
     fn gen_weighted_bool(&self, n: uint) -> bool {
         if n == 0u {
             true

branches/dist-snap/src/libfuzzer/fuzzer.rc

@@ -10,7 +10,7 @@
 
 
 #[link(name = "fuzzer",
-       vers = "0.7-rc",
+       vers = "0.7-pre",
        uuid = "d6418797-2736-4833-bd82-d3c684b7c1b0",
        url = "https://github.com/mozilla/rust/tree/master/src/libfuzzer")];
 
@@ -26,9 +26,9 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.7-rc");
-extern mod std(vers = "0.7-rc");
-extern mod syntax(vers = "0.7-rc");
+extern mod core(vers = "0.7-pre");
+extern mod std(vers = "0.7-pre");
+extern mod syntax(vers = "0.7-pre");
 
 use core::*;
 use core::io::WriterUtil;

branches/dist-snap/src/librust/rust.rc

@@ -13,14 +13,14 @@
 // FIXME #2238 Make run only accept source that emits an executable
 
 #[link(name = "rust",
-       vers = "0.7-rc",
+       vers = "0.7-pre",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-extern mod core(vers = "0.7-rc");
+extern mod core(vers = "0.7-pre");
 
 use core::run;