---

yaml
---
r: 64185
b: refs/heads/snap-stage3
c: 9ee5ce2
h: refs/heads/master
i:
  64183: 876d78a
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3cb3d754a5bb1a6b22ab3a30d01a7f950127fe61
+refs/heads/snap-stage3: 9ee5ce221501cbafd8540586ec2904063b4448d6
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/cast.rs

@@ -13,7 +13,6 @@
 use sys;
 use unstable::intrinsics;
 
-/// Casts the value at `src` to U. The two types must have the same length.
 /// Casts the value at `src` to U. The two types must have the same length.
 #[cfg(target_word_size = "32")]
 #[inline]

branches/snap-stage3/src/libstd/rand.rs

@@ -22,8 +22,7 @@ distributions like normal and exponential.
 # Examples
 
 ~~~ {.rust}
-use std::rand;
-use std::rand::RngUtil;
+use core::rand::RngUtil;
 
 fn main() {
     let mut rng = rand::rng();
@@ -34,8 +33,6 @@ fn main() {
 ~~~
 
 ~~~ {.rust}
-use std::rand;
-
 fn main () {
     let tuple_ptr = rand::random::<~(f64, char)>();
     println(fmt!("%?", tuple_ptr))
@@ -295,11 +292,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     println(fmt!("%b",rng.gen_weighted_bool(3)));
      * }
      * ~~~
@@ -312,11 +308,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     println(rng.gen_str(8));
      * }
      * ~~~
@@ -329,11 +324,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     println(fmt!("%?",rng.gen_bytes(8)));
      * }
      * ~~~
@@ -346,11 +340,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     println(fmt!("%d",rng.choose([1,2,4,8,16,32])));
      * }
      * ~~~
@@ -366,11 +359,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     let x = [rand::Weighted {weight: 4, item: 'a'},
      *              rand::Weighted {weight: 2, item: 'b'},
      *              rand::Weighted {weight: 2, item: 'c'}];
@@ -387,11 +379,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     let x = [rand::Weighted {weight: 4, item: 'a'},
      *              rand::Weighted {weight: 2, item: 'b'},
      *              rand::Weighted {weight: 2, item: 'c'}];
@@ -409,11 +400,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     let x = [rand::Weighted {weight: 4, item: 'a'},
      *              rand::Weighted {weight: 2, item: 'b'},
      *              rand::Weighted {weight: 2, item: 'c'}];
@@ -429,11 +419,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     println(fmt!("%?",rng.shuffle([1,2,3])));
      * }
      * ~~~
@@ -446,11 +435,10 @@ pub trait RngUtil {
      *
      * ~~~ {.rust}
      *
-     * use std::rand;
-     * use std::rand::RngUtil;
+     * use core::rand::RngUtil;
      *
      * fn main() {
-     *     let mut rng = rand::rng();
+     *     rng = rand::rng();
      *     let mut y = [1,2,3];
      *     rng.shuffle_mut(y);
      *     println(fmt!("%?",y));

branches/snap-stage3/src/libstd/vec.rs

@@ -1671,6 +1671,15 @@ pub trait MutableVector<'self, T> {
 
     fn swap(self, a: uint, b: uint);
 
+    /**
+     * Divides one `&mut` into two. The first will
+     * contain all indices from `0..mid` (excluding the index `mid`
+     * itself) and the second will contain all indices from
+     * `mid..len` (excluding the index `len` itself).
+     */
+    fn mut_split(self, mid: uint) -> (&'self mut [T],
+                                      &'self mut [T]);
+
     fn reverse(self);
 
     /**
@@ -1708,6 +1717,15 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
         }
     }
 
+    #[inline]
+    fn mut_split(self, mid: uint) -> (&'self mut [T], &'self mut [T]) {
+        unsafe {
+            let len = self.len();
+            let self2: &'self mut [T] = cast::transmute_copy(&self);
+            (self.mut_slice(0, mid), self2.mut_slice(mid, len))
+        }
+    }
+
     #[inline]
     fn mut_iter(self) -> VecMutIterator<'self, T> {
         unsafe {
@@ -3355,4 +3373,23 @@ mod tests {
         v.push(1);
         v.push(2);
     }
+
+    #[test]
+    fn test_mut_split() {
+        let mut values = [1u8,2,3,4,5];
+        {
+            let (left, right) = values.mut_split(2);
+            assert_eq!(left.slice(0, left.len()), [1, 2]);
+            for left.mut_iter().advance |p| {
+                *p += 1;
+            }
+
+            assert_eq!(right.slice(0, right.len()), [3, 4, 5]);
+            for right.mut_iter().advance |p| {
+                *p += 2;
+            }
+        }
+
+        assert_eq!(values, [2, 3, 5, 6, 7]);
+    }
 }