---

yaml
---
r: 6023
b: refs/heads/master
c: ad66d72
h: refs/heads/master
i:
  6021: 39035f6
  6019: 5973e65
  6015: b70bc0b
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39b729e36f813a58de6b1f5641c94f47b7a6c277
+refs/heads/master: ad66d72e6c0f77d7c6a094cf3fc5799b65824c87

trunk/src/lib/sort.rs

@@ -20,7 +20,7 @@ Merge sort. Returns a new vector containing the sorted list.
 Has worst case O(n log n) performance, best case O(n), but
 is not space efficient. This is a stable sort.
 */
-fn merge_sort<T>(le: lteq<T>, v: [T]) -> [T] {
+fn merge_sort<T>(le: lteq<T>, v: [mutable? T]) -> [T] {
     fn merge<T>(le: lteq<T>, a: [T], b: [T]) -> [T] {
         let rs: [T] = [];
         let a_len: uint = len::<T>(a);
@@ -38,7 +38,8 @@ fn merge_sort<T>(le: lteq<T>, v: [T]) -> [T] {
         ret rs;
     }
     let v_len: uint = len::<T>(v);
-    if v_len <= 1u { ret v; }
+    if v_len == 0u { ret []; }
+    if v_len == 1u { ret [v[0]]; }
     let mid: uint = v_len / 2u;
     let a: [T] = slice::<T>(v, 0u, mid);
     let b: [T] = slice::<T>(v, mid, v_len);

trunk/src/test/stdtest/sort.rs

@@ -26,3 +26,11 @@ fn test() {
         check_sort(v1, v2);
     }
 }
+
+#[test]
+fn test_merge_sort_mutable() {
+    fn lteq(&&a: int, &&b: int) -> bool { ret a <= b; }
+    let v1 = [mutable 3, 2, 1];
+    let v2 = std::sort::merge_sort(lteq, v1);
+    assert v2 == [1, 2, 3];
+}