about summary refs log tree commit diff
diff options
context:
space:
mode:
authorblake2-ppc <blake2-ppc>2013-07-17 21:12:01 +0200
committerblake2-ppc <blake2-ppc>2013-07-18 02:18:53 +0200
commite93dd34cd3acabe64e9166753e52964677232adf (patch)
tree3570b6853520b6638451cecbbd5bad2ee4230cd8
parent3d13d4b58d5d871312537fabd736811c13ebcf4d (diff)
downloadrust-e93dd34cd3acabe64e9166753e52964677232adf.tar.gz
rust-e93dd34cd3acabe64e9166753e52964677232adf.zip
Fix warnings in libextra tests
Most of these are "unneccesary allocation" in bitv, for ~[false, ..] instead
of [false, ..].
-rw-r--r--src/libextra/bitv.rs50
-rw-r--r--src/libextra/sort.rs1
2 files changed, 25 insertions, 26 deletions
diff --git a/src/libextra/bitv.rs b/src/libextra/bitv.rs
index 106b7c80f18..33a50f4e9ab 100644
--- a/src/libextra/bitv.rs
+++ b/src/libextra/bitv.rs
@@ -893,9 +893,9 @@ mod tests {
     #[test]
     fn test_1_element() {
         let mut act = Bitv::new(1u, false);
-        assert!(act.eq_vec(~[false]));
+        assert!(act.eq_vec([false]));
         act = Bitv::new(1u, true);
-        assert!(act.eq_vec(~[true]));
+        assert!(act.eq_vec([true]));
     }
 
     #[test]
@@ -913,11 +913,11 @@ mod tests {
 
         act = Bitv::new(10u, false);
         assert!((act.eq_vec(
-                    ~[false, false, false, false, false, false, false, false, false, false])));
+                    [false, false, false, false, false, false, false, false, false, false])));
         // all 1
 
         act = Bitv::new(10u, true);
-        assert!((act.eq_vec(~[true, true, true, true, true, true, true, true, true, true])));
+        assert!((act.eq_vec([true, true, true, true, true, true, true, true, true, true])));
         // mixed
 
         act = Bitv::new(10u, false);
@@ -926,7 +926,7 @@ mod tests {
         act.set(2u, true);
         act.set(3u, true);
         act.set(4u, true);
-        assert!((act.eq_vec(~[true, true, true, true, true, false, false, false, false, false])));
+        assert!((act.eq_vec([true, true, true, true, true, false, false, false, false, false])));
         // mixed
 
         act = Bitv::new(10u, false);
@@ -935,7 +935,7 @@ mod tests {
         act.set(7u, true);
         act.set(8u, true);
         act.set(9u, true);
-        assert!((act.eq_vec(~[false, false, false, false, false, true, true, true, true, true])));
+        assert!((act.eq_vec([false, false, false, false, false, true, true, true, true, true])));
         // mixed
 
         act = Bitv::new(10u, false);
@@ -943,7 +943,7 @@ mod tests {
         act.set(3u, true);
         act.set(6u, true);
         act.set(9u, true);
-        assert!((act.eq_vec(~[true, false, false, true, false, false, true, false, false, true])));
+        assert!((act.eq_vec([true, false, false, true, false, false, true, false, false, true])));
     }
 
     #[test]
@@ -953,14 +953,14 @@ mod tests {
 
         act = Bitv::new(31u, false);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(31u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
+                [true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true]));
         // mixed
@@ -975,7 +975,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
+                [true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false]));
         // mixed
@@ -990,7 +990,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false]));
         // mixed
@@ -1004,7 +1004,7 @@ mod tests {
         act.set(29u, true);
         act.set(30u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true]));
         // mixed
@@ -1014,7 +1014,7 @@ mod tests {
         act.set(17u, true);
         act.set(30u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, true, false, false, false, false, false, false, false, false,
+                [false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true]));
     }
@@ -1026,14 +1026,14 @@ mod tests {
 
         act = Bitv::new(32u, false);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(32u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
+                [true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true]));
         // mixed
@@ -1048,7 +1048,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
+                [true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false]));
         // mixed
@@ -1063,7 +1063,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false, false]));
         // mixed
@@ -1078,7 +1078,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true, true]));
         // mixed
@@ -1089,7 +1089,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, true, false, false, false, false, false, false, false, false,
+                [false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true, true]));
     }
@@ -1101,14 +1101,14 @@ mod tests {
 
         act = Bitv::new(33u, false);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false]));
         // all 1
 
         act = Bitv::new(33u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, true, true, true, true, true,
+                [true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true]));
         // mixed
@@ -1123,7 +1123,7 @@ mod tests {
         act.set(6u, true);
         act.set(7u, true);
         assert!(act.eq_vec(
-                ~[true, true, true, true, true, true, true, true, false, false, false, false, false,
+                [true, true, true, true, true, true, true, true, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false]));
         // mixed
@@ -1138,7 +1138,7 @@ mod tests {
         act.set(22u, true);
         act.set(23u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, true, true, true, true, true, true, true,
                 false, false, false, false, false, false, false, false, false]));
         // mixed
@@ -1153,7 +1153,7 @@ mod tests {
         act.set(30u, true);
         act.set(31u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, false, false, false, false, false, false, false, false,
+                [false, false, false, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false, false, false, false,
                 false, true, true, true, true, true, true, true, true, false]));
         // mixed
@@ -1165,7 +1165,7 @@ mod tests {
         act.set(31u, true);
         act.set(32u, true);
         assert!(act.eq_vec(
-                ~[false, false, false, true, false, false, false, false, false, false, false, false,
+                [false, false, false, true, false, false, false, false, false, false, false, false,
                 false, false, false, false, false, true, false, false, false, false, false, false,
                 false, false, false, false, false, false, true, true, true]));
     }
diff --git a/src/libextra/sort.rs b/src/libextra/sort.rs
index 4269447c7ea..56a906e0a5d 100644
--- a/src/libextra/sort.rs
+++ b/src/libextra/sort.rs
@@ -792,7 +792,6 @@ mod test_qsort {
 
     use sort::*;
 
-    use std::int;
     use std::vec;
 
     fn check_sort(v1: &mut [int], v2: &mut [int]) {