Use assert_eq! rather than assert! where possible

11 files changed, 49 insertions, 49 deletions

diff --git a/src/libcore/rt/io/flate.rs b/src/libcore/rt/io/flate.rs
index 24537bef329..db2683dc85d 100644
--- a/src/libcore/rt/io/flate.rs
+++ b/src/libcore/rt/io/flate.rs
@@ -114,8 +114,8 @@ mod test {
         let mut inflate_reader = InflateReader::new(mem_reader);
         let mut out_bytes = [0, .. 100];
         let bytes_read = inflate_reader.read(out_bytes).get();
-        assert!(bytes_read == in_bytes.len());
+        assert_eq!(bytes_read, in_bytes.len());
         let out_msg = str::from_bytes(out_bytes);
         assert!(in_msg == out_msg);
     }
-}
\ No newline at end of file
+}
diff --git a/src/libcore/rt/io/mem.rs b/src/libcore/rt/io/mem.rs
index 06e1466831d..b2701c1fdc3 100644
--- a/src/libcore/rt/io/mem.rs
+++ b/src/libcore/rt/io/mem.rs
@@ -86,7 +86,7 @@ impl Reader for MemReader {
         {
             let input = self.buf.slice(self.pos, self.pos + write_len);
             let output = vec::mut_slice(buf, 0, write_len);
-            assert!(input.len() == output.len());
+            assert_eq!(input.len(), output.len());
             vec::bytes::copy_memory(output, input, write_len);
         }
         self.pos += write_len;
@@ -189,33 +189,33 @@ mod test {
     #[test]
     fn test_mem_writer() {
         let mut writer = MemWriter::new();
-        assert!(writer.tell() == 0);
+        assert_eq!(writer.tell(), 0);
         writer.write([0]);
-        assert!(writer.tell() == 1);
+        assert_eq!(writer.tell(), 1);
         writer.write([1, 2, 3]);
         writer.write([4, 5, 6, 7]);
-        assert!(writer.tell() == 8);
-        assert!(writer.inner() == ~[0, 1, 2, 3, 4, 5 , 6, 7]);
+        assert_eq!(writer.tell(), 8);
+        assert_eq!(writer.inner(), ~[0, 1, 2, 3, 4, 5 , 6, 7]);
     }
 
     #[test]
     fn test_mem_reader() {
         let mut reader = MemReader::new(~[0, 1, 2, 3, 4, 5, 6, 7]);
         let mut buf = [];
-        assert!(reader.read(buf) == Some(0));
-        assert!(reader.tell() == 0);
+        assert_eq!(reader.read(buf), Some(0));
+        assert_eq!(reader.tell(), 0);
         let mut buf = [0];
-        assert!(reader.read(buf) == Some(1));
-        assert!(reader.tell() == 1);
-        assert!(buf == [0]);
+        assert_eq!(reader.read(buf), Some(1));
+        assert_eq!(reader.tell(), 1);
+        assert_eq!(buf, [0]);
         let mut buf = [0, ..4];
-        assert!(reader.read(buf) == Some(4));
-        assert!(reader.tell() == 5);
-        assert!(buf == [1, 2, 3, 4]);
-        assert!(reader.read(buf) == Some(3));
-        assert!(buf.slice(0, 3) == [5, 6, 7]);
+        assert_eq!(reader.read(buf), Some(4));
+        assert_eq!(reader.tell(), 5);
+        assert_eq!(buf, [1, 2, 3, 4]);
+        assert_eq!(reader.read(buf), Some(3));
+        assert_eq!(buf.slice(0, 3), [5, 6, 7]);
         assert!(reader.eof());
-        assert!(reader.read(buf) == None);
+        assert_eq!(reader.read(buf), None);
         assert!(reader.eof());
     }
 }
diff --git a/src/libcore/rt/io/net/tcp.rs b/src/libcore/rt/io/net/tcp.rs
index a833e92fc10..a5fd7a395de 100644
--- a/src/libcore/rt/io/net/tcp.rs
+++ b/src/libcore/rt/io/net/tcp.rs
@@ -262,7 +262,7 @@ mod test {
                     let mut stream = listener.accept();
                     let mut buf = [0];
                     stream.read(buf);
-                    assert!(buf[0] == 99);
+                    assert_eq!(buf[0], 99);
                 }
             }
 
diff --git a/src/libcore/rt/io/option.rs b/src/libcore/rt/io/option.rs
index 6ae747f8b4b..d71ef55d3ad 100644
--- a/src/libcore/rt/io/option.rs
+++ b/src/libcore/rt/io/option.rs
@@ -87,7 +87,7 @@ mod test {
             let mut writer: Option<MemWriter> = Some(MemWriter::new());
             writer.write([0, 1, 2]);
             writer.flush();
-            assert!(writer.unwrap().inner() == ~[0, 1, 2]);
+            assert_eq!(writer.unwrap().inner(), ~[0, 1, 2]);
         }
     }
 
@@ -98,7 +98,7 @@ mod test {
 
             let mut called = false;
             do io_error::cond.trap(|err| {
-                assert!(err.kind == PreviousIoError);
+                assert_eq!(err.kind, PreviousIoError);
                 called = true;
             }).in {
                 writer.write([0, 0, 0]);
@@ -107,7 +107,7 @@ mod test {
 
             let mut called = false;
             do io_error::cond.trap(|err| {
-                assert!(err.kind == PreviousIoError);
+                assert_eq!(err.kind, PreviousIoError);
                 called = true;
             }).in {
                 writer.flush();
@@ -122,7 +122,7 @@ mod test {
             let mut reader: Option<MemReader> = Some(MemReader::new(~[0, 1, 2, 3]));
             let mut buf = [0, 0];
             reader.read(buf);
-            assert!(buf == [0, 1]);
+            assert_eq!(buf, [0, 1]);
             assert!(!reader.eof());
         }
     }
@@ -134,7 +134,7 @@ mod test {
 
         let mut called = false;
         do read_error::cond.trap(|err| {
-            assert!(err.kind == PreviousIoError);
+            assert_eq!(err.kind, PreviousIoError);
             called = true;
         }).in {
             reader.read(buf);
@@ -143,7 +143,7 @@ mod test {
 
         let mut called = false;
         do io_error::cond.trap(|err| {
-            assert!(err.kind == PreviousIoError);
+            assert_eq!(err.kind, PreviousIoError);
             called = true;
         }).in {
             assert!(reader.eof());
diff --git a/src/libcore/rt/mod.rs b/src/libcore/rt/mod.rs
index dab627188d0..4dce9da505b 100644
--- a/src/libcore/rt/mod.rs
+++ b/src/libcore/rt/mod.rs
@@ -217,15 +217,15 @@ fn test_context() {
     use rt::uv::uvio::UvEventLoop;
     use cell::Cell;
 
-    assert!(context() == OldTaskContext);
+    assert_eq!(context(), OldTaskContext);
     do run_in_bare_thread {
-        assert!(context() == GlobalContext);
+        assert_eq!(context(), GlobalContext);
         let mut sched = ~UvEventLoop::new_scheduler();
         let task = ~do Coroutine::new(&mut sched.stack_pool) {
-            assert!(context() == TaskContext);
+            assert_eq!(context(), TaskContext);
             let sched = local_sched::take();
             do sched.deschedule_running_task_and_then() |task| {
-                assert!(context() == SchedulerContext);
+                assert_eq!(context(), SchedulerContext);
                 let task = Cell(task);
                 do local_sched::borrow |sched| {
                     sched.enqueue_task(task.take());
diff --git a/src/libcore/rt/sched.rs b/src/libcore/rt/sched.rs
index c66f20e01b2..7fd40fb329f 100644
--- a/src/libcore/rt/sched.rs
+++ b/src/libcore/rt/sched.rs
@@ -445,7 +445,7 @@ mod test {
                 sched.enqueue_task(task);
             }
             sched.run();
-            assert!(task_count == total);
+            assert_eq!(task_count, total);
         }
     }
 
@@ -473,7 +473,7 @@ mod test {
             };
             sched.enqueue_task(task1);
             sched.run();
-            assert!(count == 3);
+            assert_eq!(count, 3);
         }
     }
 
@@ -492,7 +492,7 @@ mod test {
             sched.enqueue_task(start_task);
             sched.run();
 
-            assert!(count == MAX);
+            assert_eq!(count, MAX);
 
             fn run_task(count_ptr: *mut int) {
                 do local_sched::borrow |sched| {
diff --git a/src/libcore/rt/thread_local_storage.rs b/src/libcore/rt/thread_local_storage.rs
index 6a08c0f59b1..7187d2db41c 100644
--- a/src/libcore/rt/thread_local_storage.rs
+++ b/src/libcore/rt/thread_local_storage.rs
@@ -21,12 +21,12 @@ pub type Key = pthread_key_t;
 
 #[cfg(unix)]
 pub unsafe fn create(key: &mut Key) {
-    assert!(0 == pthread_key_create(key, null()));
+    assert_eq!(0, pthread_key_create(key, null()));
 }
 
 #[cfg(unix)]
 pub unsafe fn set(key: Key, value: *mut c_void) {
-    assert!(0 == pthread_setspecific(key, value));
+    assert_eq!(0, pthread_setspecific(key, value));
 }
 
 #[cfg(unix)]
@@ -91,10 +91,10 @@ fn tls_smoke_test() {
         create(&mut key);
         set(key, transmute(value));
         let value: ~int = transmute(get(key));
-        assert!(value == ~20);
+        assert_eq!(value, ~20);
         let value = ~30;
         set(key, transmute(value));
         let value: ~int = transmute(get(key));
-        assert!(value == ~30);
+        assert_eq!(value, ~30);
     }
 }
diff --git a/src/libcore/rt/uv/mod.rs b/src/libcore/rt/uv/mod.rs
index 99a5252c88a..ad593058303 100644
--- a/src/libcore/rt/uv/mod.rs
+++ b/src/libcore/rt/uv/mod.rs
@@ -231,7 +231,7 @@ impl ToStr for UvError {
 fn error_smoke_test() {
     let err = uvll::uv_err_t { code: 1, sys_errno_: 1 };
     let err: UvError = UvError(err);
-    assert!(err.to_str() == ~"EOF: end of file");
+    assert_eq!(err.to_str(), ~"EOF: end of file");
 }
 
 pub fn last_uv_error<H, W: Watcher + NativeHandle<*H>>(watcher: &W) -> UvError {
@@ -397,7 +397,7 @@ fn idle_smoke_test() {
         }
         loop_.run();
         loop_.close();
-        assert!(count == 10);
+        assert_eq!(count, 10);
     }
 }
 
diff --git a/src/libcore/rt/uv/net.rs b/src/libcore/rt/uv/net.rs
index bdd5588014c..68b871e6b31 100644
--- a/src/libcore/rt/uv/net.rs
+++ b/src/libcore/rt/uv/net.rs
@@ -114,7 +114,7 @@ pub impl StreamWatcher {
         let self_handle = self.native_handle() as *c_void;
         let stream_handle = stream.native_handle() as *c_void;
         unsafe {
-            assert!(0 == uvll::accept(self_handle, stream_handle));
+            assert_eq!(0, uvll::accept(self_handle, stream_handle));
         }
     }
 
@@ -158,7 +158,7 @@ pub impl TcpWatcher {
         unsafe {
             let handle = malloc_handle(UV_TCP);
             assert!(handle.is_not_null());
-            assert!(0 == uvll::tcp_init(loop_.native_handle(), handle));
+            assert_eq!(0, uvll::tcp_init(loop_.native_handle(), handle));
             let mut watcher: TcpWatcher = NativeHandle::from_native_handle(handle);
             watcher.install_watcher_data();
             return watcher;
@@ -350,7 +350,7 @@ mod test {
             do tcp_watcher.connect(addr) |stream_watcher, status| {
                 rtdebug!("tcp_watcher.connect!");
                 assert!(status.is_some());
-                assert!(status.get().name() == ~"ECONNREFUSED");
+                assert_eq!(status.get().name(), ~"ECONNREFUSED");
                 stream_watcher.close(||());
             }
             loop_.run();
@@ -397,7 +397,7 @@ mod test {
                             count += 1;
                         }
                     } else {
-                        assert!(count == MAX);
+                        assert_eq!(count, MAX);
                         do stream_watcher.close {
                             server_stream_watcher.close(||());
                         }
diff --git a/src/libcore/rt/uv/uvio.rs b/src/libcore/rt/uv/uvio.rs
index ce4eb6aff87..8666d43a100 100644
--- a/src/libcore/rt/uv/uvio.rs
+++ b/src/libcore/rt/uv/uvio.rs
@@ -97,7 +97,7 @@ fn test_callback_run_once() {
             unsafe { *count_ptr += 1 }
         }
         event_loop.run();
-        assert!(count == 1);
+        assert_eq!(count, 1);
     }
 }
 
@@ -379,10 +379,10 @@ fn test_simple_tcp_server_and_client() {
                 let mut stream = listener.accept().unwrap();
                 let mut buf = [0, .. 2048];
                 let nread = stream.read(buf).unwrap();
-                assert!(nread == 8);
+                assert_eq!(nread, 8);
                 for uint::range(0, nread) |i| {
                     rtdebug!("%u", buf[i] as uint);
-                    assert!(buf[i] == i as u8);
+                    assert_eq!(buf[i], i as u8);
                 }
             }
         }
@@ -416,7 +416,7 @@ fn test_read_and_block() {
                 let nread = stream.read(buf).unwrap();
                 for uint::range(0, nread) |i| {
                     let val = buf[i] as uint;
-                    assert!(val == current % 8);
+                    assert_eq!(val, current % 8);
                     current += 1;
                 }
                 reads += 1;
@@ -482,7 +482,7 @@ fn test_read_read_read() {
                     rtdebug!("read %u bytes", nread as uint);
                     total_bytes_read += nread;
                     for uint::range(0, nread) |i| {
-                        assert!(buf[i] == 1);
+                        assert_eq!(buf[i], 1);
                     }
                 }
                 rtdebug!("read %u bytes total", total_bytes_read as uint);
diff --git a/src/libcore/rt/uv/uvll.rs b/src/libcore/rt/uv/uvll.rs
index 94e1703b263..ddc9040d730 100644
--- a/src/libcore/rt/uv/uvll.rs
+++ b/src/libcore/rt/uv/uvll.rs
@@ -132,14 +132,14 @@ pub unsafe fn free_req(v: *c_void) {
 #[test]
 fn handle_sanity_check() {
     unsafe {
-        assert!(UV_HANDLE_TYPE_MAX as uint == rust_uv_handle_type_max());
+        assert_eq!(UV_HANDLE_TYPE_MAX as uint, rust_uv_handle_type_max());
     }
 }
 
 #[test]
 fn request_sanity_check() {
     unsafe {
-        assert!(UV_REQ_TYPE_MAX as uint == rust_uv_req_type_max());
+        assert_eq!(UV_REQ_TYPE_MAX as uint, rust_uv_req_type_max());
     }
 }