about summary refs log tree commit diff
path: root/src/libstd/priority_queue.rs
diff options
context:
space:
mode:
authorCorey Richardson <corey@octayn.net>2013-05-18 22:02:45 -0400
committerCorey Richardson <corey@octayn.net>2013-05-19 08:16:02 -0400
commitcc57ca012a1f49875e19b1b089c91928dc339979 (patch)
tree9f10c27962dbb7c844bc3abb7e20119d75f02aa6 /src/libstd/priority_queue.rs
parent3acf37897a4ca7f019ed8894ec3878801377773d (diff)
downloadrust-cc57ca012a1f49875e19b1b089c91928dc339979.tar.gz
rust-cc57ca012a1f49875e19b1b089c91928dc339979.zip
Use assert_eq! rather than assert! where possible
Diffstat (limited to 'src/libstd/priority_queue.rs')
-rw-r--r--src/libstd/priority_queue.rs68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index 3c96a8e145d..b54fc81aac1 100644
--- a/src/libstd/priority_queue.rs
+++ b/src/libstd/priority_queue.rs
@@ -196,87 +196,87 @@ mod tests {
         let mut sorted = merge_sort(data, le);
         let mut heap = from_vec(data);
         while !heap.is_empty() {
-            assert!(heap.top() == sorted.last());
-            assert!(heap.pop() == sorted.pop());
+            assert_eq!(heap.top(), sorted.last());
+            assert_eq!(heap.pop(), sorted.pop());
         }
     }
 
     #[test]
     fn test_push() {
         let mut heap = from_vec(~[2, 4, 9]);
-        assert!(heap.len() == 3);
+        assert_eq!(heap.len(), 3);
         assert!(*heap.top() == 9);
         heap.push(11);
-        assert!(heap.len() == 4);
+        assert_eq!(heap.len(), 4);
         assert!(*heap.top() == 11);
         heap.push(5);
-        assert!(heap.len() == 5);
+        assert_eq!(heap.len(), 5);
         assert!(*heap.top() == 11);
         heap.push(27);
-        assert!(heap.len() == 6);
+        assert_eq!(heap.len(), 6);
         assert!(*heap.top() == 27);
         heap.push(3);
-        assert!(heap.len() == 7);
+        assert_eq!(heap.len(), 7);
         assert!(*heap.top() == 27);
         heap.push(103);
-        assert!(heap.len() == 8);
+        assert_eq!(heap.len(), 8);
         assert!(*heap.top() == 103);
     }
 
     #[test]
     fn test_push_unique() {
         let mut heap = from_vec(~[~2, ~4, ~9]);
-        assert!(heap.len() == 3);
+        assert_eq!(heap.len(), 3);
         assert!(*heap.top() == ~9);
         heap.push(~11);
-        assert!(heap.len() == 4);
+        assert_eq!(heap.len(), 4);
         assert!(*heap.top() == ~11);
         heap.push(~5);
-        assert!(heap.len() == 5);
+        assert_eq!(heap.len(), 5);
         assert!(*heap.top() == ~11);
         heap.push(~27);
-        assert!(heap.len() == 6);
+        assert_eq!(heap.len(), 6);
         assert!(*heap.top() == ~27);
         heap.push(~3);
-        assert!(heap.len() == 7);
+        assert_eq!(heap.len(), 7);
         assert!(*heap.top() == ~27);
         heap.push(~103);
-        assert!(heap.len() == 8);
+        assert_eq!(heap.len(), 8);
         assert!(*heap.top() == ~103);
     }
 
     #[test]
     fn test_push_pop() {
         let mut heap = from_vec(~[5, 5, 2, 1, 3]);
-        assert!(heap.len() == 5);
-        assert!(heap.push_pop(6) == 6);
-        assert!(heap.len() == 5);
-        assert!(heap.push_pop(0) == 5);
-        assert!(heap.len() == 5);
-        assert!(heap.push_pop(4) == 5);
-        assert!(heap.len() == 5);
-        assert!(heap.push_pop(1) == 4);
-        assert!(heap.len() == 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(6), 6);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(0), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(4), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(1), 4);
+        assert_eq!(heap.len(), 5);
     }
 
     #[test]
     fn test_replace() {
         let mut heap = from_vec(~[5, 5, 2, 1, 3]);
-        assert!(heap.len() == 5);
-        assert!(heap.replace(6) == 5);
-        assert!(heap.len() == 5);
-        assert!(heap.replace(0) == 6);
-        assert!(heap.len() == 5);
-        assert!(heap.replace(4) == 5);
-        assert!(heap.len() == 5);
-        assert!(heap.replace(1) == 4);
-        assert!(heap.len() == 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(6), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(0), 6);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(4), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(1), 4);
+        assert_eq!(heap.len(), 5);
     }
 
     fn check_to_vec(data: ~[int]) {
         let heap = from_vec(copy data);
-        assert!(merge_sort((copy heap).to_vec(), le) == merge_sort(data, le));
-        assert!(heap.to_sorted_vec() == merge_sort(data, le));
+        assert_eq!(merge_sort((copy heap).to_vec(), le), merge_sort(data, le));
+        assert_eq!(heap.to_sorted_vec(), merge_sort(data, le));
     }
 
     #[test]