---

yaml
---
r: 30151
b: refs/heads/incoming
c: 206edf6
h: refs/heads/master
i:
  30149: 22c428f
  30147: db59ef2
  30143: 8a8d67c
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0a01d82f6f3e33ca742c8e985d2a4819faeafe40
+refs/heads/incoming: 206edf66c92e12f1d98b56ea48a340e7e86d8552
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/rand.rs

@@ -165,12 +165,12 @@ impl Rng {
     }
 
     /// Choose an item randomly, failing if values is empty
-    fn choose<T:copy>(values: ~[T]) -> T {
+    fn choose<T:copy>(values: &[T]) -> T {
         self.choose_option(values).get()
     }
 
     /// Choose Some(item) randomly, returning None if values is empty
-    fn choose_option<T:copy>(values: ~[T]) -> Option<T> {
+    fn choose_option<T:copy>(values: &[T]) -> Option<T> {
         if values.is_empty() {
             None
         } else {
@@ -182,15 +182,15 @@ impl Rng {
      * Choose an item respecting the relative weights, failing if the sum of
      * the weights is 0
      */
-    fn choose_weighted<T: copy>(v : ~[Weighted<T>]) -> T {
+    fn choose_weighted<T: copy>(v : &[Weighted<T>]) -> T {
         self.choose_weighted_option(v).get()
     }
 
     /**
      * Choose Some(item) respecting the relative weights, returning none if
      * the sum of the weights is 0
      */
-    fn choose_weighted_option<T:copy>(v: ~[Weighted<T>]) -> Option<T> {
+    fn choose_weighted_option<T:copy>(v: &[Weighted<T>]) -> Option<T> {
         let mut total = 0u;
         for v.each |item| {
             total += item.weight;
@@ -213,7 +213,7 @@ impl Rng {
      * Return a vec containing copies of the items, in order, where
      * the weight of the item determines how many copies there are
      */
-    fn weighted_vec<T:copy>(v: ~[Weighted<T>]) -> ~[T] {
+    fn weighted_vec<T:copy>(v: &[Weighted<T>]) -> ~[T] {
         let mut r = ~[];
         for v.each |item| {
             for uint::range(0u, item.weight) |_i| {
@@ -224,14 +224,14 @@ impl Rng {
     }
 
     /// Shuffle a vec
-    fn shuffle<T:copy>(values: ~[T]) -> ~[T] {
-        let mut m = vec::to_mut(values);
+    fn shuffle<T:copy>(values: &[T]) -> ~[T] {
+        let mut m = vec::from_slice(values);
         self.shuffle_mut(m);
-        return vec::from_mut(m);
+        return m;
     }
 
     /// Shuffle a mutable vec in place
-    fn shuffle_mut<T>(&&values: ~[mut T]) {
+    fn shuffle_mut<T>(values: &[mut T]) {
         let mut i = values.len();
         while i >= 2u {
             // invariant: elements with index >= i have been locked in place.
@@ -402,14 +402,14 @@ mod tests {
     #[test]
     fn choose() {
         let r = rand::Rng();
-        assert r.choose(~[1, 1, 1]) == 1;
+        assert r.choose([1, 1, 1]) == 1;
     }
 
     #[test]
     fn choose_option() {
         let r = rand::Rng();
-        assert r.choose_option(~[]).is_none();
-        assert r.choose_option(~[1, 1, 1]) == Some(1);
+        assert r.choose_option::<int>([]).is_none();
+        assert r.choose_option([1, 1, 1]) == Some(1);
     }
 
     #[test]
@@ -431,7 +431,7 @@ mod tests {
             {weight: 0u, item: 42},
             {weight: 1u, item: 43}
         ]) == Some(43);
-        assert r.choose_weighted_option(~[]).is_none();
+        assert r.choose_weighted_option::<int>([]).is_none();
     }
 
     #[test]

branches/incoming/src/libcore/vec.rs

@@ -1086,7 +1086,7 @@ pure fn zip<T, U>(+v: ~[const T], +u: ~[const U]) -> ~[(T, U)] {
  * * a - The index of the first element
  * * b - The index of the second element
  */
-fn swap<T>(&&v: ~[mut T], a: uint, b: uint) {
+fn swap<T>(v: &[mut T], a: uint, b: uint) {
     v[a] <-> v[b];
 }