Remove vecs from std::sort

5 files changed, 33 insertions, 62 deletions

diff --git a/src/test/stdtest/qsort.rs b/src/test/stdtest/qsort.rs
index c8f19e373b3..0799f505e3c 100644
--- a/src/test/stdtest/qsort.rs
+++ b/src/test/stdtest/qsort.rs
@@ -5,8 +5,8 @@ import std::sort;
 import std::ivec;
 import std::int;
 
-fn check_sort(v1: vec[mutable int], v2: vec[mutable int]) {
-    let len = std::vec::len[int](v1);
+fn check_sort(v1: &[mutable int], v2: &[mutable int]) {
+    let len = std::ivec::len[int](v1);
     fn ltequal(a: &int, b: &int) -> bool { ret a <= b; }
     let f = ltequal;
     std::sort::quick_sort[int](f, v1);
@@ -17,24 +17,24 @@ fn check_sort(v1: vec[mutable int], v2: vec[mutable int]) {
 #[test]
 fn test() {
     {
-        let v1 = [mutable 3, 7, 4, 5, 2, 9, 5, 8];
-        let v2 = [mutable 2, 3, 4, 5, 5, 7, 8, 9];
+        let v1 = ~[mutable 3, 7, 4, 5, 2, 9, 5, 8];
+        let v2 = ~[mutable 2, 3, 4, 5, 5, 7, 8, 9];
         check_sort(v1, v2);
     }
     {
-        let v1 = [mutable 1, 1, 1];
-        let v2 = [mutable 1, 1, 1];
+        let v1 = ~[mutable 1, 1, 1];
+        let v2 = ~[mutable 1, 1, 1];
         check_sort(v1, v2);
     }
     {
-        let v1: vec[mutable int] = [mutable ];
-        let v2: vec[mutable int] = [mutable ];
+        let v1: [mutable int] = ~[mutable ];
+        let v2: [mutable int] = ~[mutable ];
         check_sort(v1, v2);
     }
-    { let v1 = [mutable 9]; let v2 = [mutable 9]; check_sort(v1, v2); }
+    { let v1 = ~[mutable 9]; let v2 = ~[mutable 9]; check_sort(v1, v2); }
     {
-        let v1 = [mutable 9, 3, 3, 3, 9];
-        let v2 = [mutable 3, 3, 3, 9, 9];
+        let v1 = ~[mutable 9, 3, 3, 3, 9];
+        let v2 = ~[mutable 3, 3, 3, 9, 9];
         check_sort(v1, v2);
     }
 }
@@ -47,7 +47,7 @@ fn test_simple() {
     let expected = ~[1, 2, 3];
 
     fn lteq(a: &int, b: &int) -> bool { int::le(a, b) }
-    sort::ivector::quick_sort(lteq, names);
+    sort::quick_sort(lteq, names);
 
     let pairs = ivec::zip(expected, ivec::from_mut(names));
     for p: {_0: int, _1: int}  in pairs {
diff --git a/src/test/stdtest/qsort3.rs b/src/test/stdtest/qsort3.rs
index 79e4c42c590..fe871ceda21 100644
--- a/src/test/stdtest/qsort3.rs
+++ b/src/test/stdtest/qsort3.rs
@@ -1,8 +1,8 @@
 
 use std;
 
-fn check_sort(v1: vec[mutable int], v2: vec[mutable int]) {
-    let len = std::vec::len[int](v1);
+fn check_sort(v1: &[mutable int], v2: &[mutable int]) {
+    let len = std::ivec::len[int](v1);
     fn lt(a: &int, b: &int) -> bool { ret a < b; }
     fn equal(a: &int, b: &int) -> bool { ret a == b; }
     let f1 = lt;
@@ -15,24 +15,24 @@ fn check_sort(v1: vec[mutable int], v2: vec[mutable int]) {
 #[test]
 fn test() {
     {
-        let v1 = [mutable 3, 7, 4, 5, 2, 9, 5, 8];
-        let v2 = [mutable 2, 3, 4, 5, 5, 7, 8, 9];
+        let v1 = ~[mutable 3, 7, 4, 5, 2, 9, 5, 8];
+        let v2 = ~[mutable 2, 3, 4, 5, 5, 7, 8, 9];
         check_sort(v1, v2);
     }
     {
-        let v1 = [mutable 1, 1, 1];
-        let v2 = [mutable 1, 1, 1];
+        let v1 = ~[mutable 1, 1, 1];
+        let v2 = ~[mutable 1, 1, 1];
         check_sort(v1, v2);
     }
     {
-        let v1: vec[mutable int] = [mutable ];
-        let v2: vec[mutable int] = [mutable ];
+        let v1: [mutable int] = ~[mutable ];
+        let v2: [mutable int] = ~[mutable ];
         check_sort(v1, v2);
     }
-    { let v1 = [mutable 9]; let v2 = [mutable 9]; check_sort(v1, v2); }
+    { let v1 = ~[mutable 9]; let v2 = ~[mutable 9]; check_sort(v1, v2); }
     {
-        let v1 = [mutable 9, 3, 3, 3, 9];
-        let v2 = [mutable 3, 3, 3, 9, 9];
+        let v1 = ~[mutable 9, 3, 3, 3, 9];
+        let v2 = ~[mutable 3, 3, 3, 9, 9];
         check_sort(v1, v2);
     }
 }
diff --git a/src/test/stdtest/sort.rs b/src/test/stdtest/sort.rs
index e2ce3f028fb..eac5204cde3 100644
--- a/src/test/stdtest/sort.rs
+++ b/src/test/stdtest/sort.rs
@@ -1,8 +1,8 @@
 
 use std;
 
-fn check_sort(v1: vec[int], v2: vec[int]) {
-    let len = std::vec::len[int](v1);
+fn check_sort(v1: &[int], v2: &[int]) {
+    let len = std::ivec::len[int](v1);
     fn lteq(a: &int, b: &int) -> bool { ret a <= b; }
     let f = lteq;
     let v3 = std::sort::merge_sort[int](f, v1);
@@ -13,16 +13,16 @@ fn check_sort(v1: vec[int], v2: vec[int]) {
 #[test]
 fn test() {
     {
-        let v1 = [3, 7, 4, 5, 2, 9, 5, 8];
-        let v2 = [2, 3, 4, 5, 5, 7, 8, 9];
+        let v1 = ~[3, 7, 4, 5, 2, 9, 5, 8];
+        let v2 = ~[2, 3, 4, 5, 5, 7, 8, 9];
         check_sort(v1, v2);
     }
-    { let v1 = [1, 1, 1]; let v2 = [1, 1, 1]; check_sort(v1, v2); }
-    { let v1: vec[int] = []; let v2: vec[int] = []; check_sort(v1, v2); }
-    { let v1 = [9]; let v2 = [9]; check_sort(v1, v2); }
+    { let v1 = ~[1, 1, 1]; let v2 = ~[1, 1, 1]; check_sort(v1, v2); }
+    { let v1: [int] = ~[]; let v2: [int] = ~[]; check_sort(v1, v2); }
+    { let v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); }
     {
-        let v1 = [9, 3, 3, 3, 9];
-        let v2 = [3, 3, 3, 9, 9];
+        let v1 = ~[9, 3, 3, 3, 9];
+        let v2 = ~[3, 3, 3, 9, 9];
         check_sort(v1, v2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/stdtest/sort_ivec.rs b/src/test/stdtest/sort_ivec.rs
deleted file mode 100644
index 3e52de4ad2e..00000000000
--- a/src/test/stdtest/sort_ivec.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-
-use std;
-
-fn check_sort(v1: &[int], v2: &[int]) {
-    let len = std::ivec::len[int](v1);
-    fn lteq(a: &int, b: &int) -> bool { ret a <= b; }
-    let f = lteq;
-    let v3 = std::sort::ivector::merge_sort[int](f, v1);
-    let i = 0u;
-    while i < len { log v3.(i); assert (v3.(i) == v2.(i)); i += 1u; }
-}
-
-#[test]
-fn test() {
-    {
-        let v1 = ~[3, 7, 4, 5, 2, 9, 5, 8];
-        let v2 = ~[2, 3, 4, 5, 5, 7, 8, 9];
-        check_sort(v1, v2);
-    }
-    { let v1 = ~[1, 1, 1]; let v2 = ~[1, 1, 1]; check_sort(v1, v2); }
-    { let v1: [int] = ~[]; let v2: [int] = ~[]; check_sort(v1, v2); }
-    { let v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); }
-    {
-        let v1 = ~[9, 3, 3, 3, 9];
-        let v2 = ~[3, 3, 3, 9, 9];
-        check_sort(v1, v2);
-    }
-}
diff --git a/src/test/stdtest/stdtest.rc b/src/test/stdtest/stdtest.rc
index b8907248cbd..401587ed36e 100644
--- a/src/test/stdtest/stdtest.rc
+++ b/src/test/stdtest/stdtest.rc
@@ -21,7 +21,6 @@ mod qsort;
 mod rand;
 mod run;
 mod sha1;
-mod sort_ivec;
 mod sort;
 mod str_buf;
 mod str;