1 files changed, 10 insertions, 12 deletions
diff --git a/src/test/bench/rt-messaging-ping-pong.rs b/src/test/bench/rt-messaging-ping-pong.rs
index de9e6629fbf..adf773a2f25 100644
--- a/src/test/bench/rt-messaging-ping-pong.rs
+++ b/src/test/bench/rt-messaging-ping-pong.rs
@@ -19,9 +19,7 @@
 
 use std::sync::mpsc::channel;
 use std::os;
-use std::str::from_str;
 use std::thread::Thread;
-use std::uint;
 
 // This is a simple bench that creates M pairs of tasks. These
 // tasks ping-pong back and forth over a pair of streams. This is a
@@ -32,24 +30,24 @@ fn ping_pong_bench(n: uint, m: uint) {
 
     // Create pairs of tasks that pingpong back and forth.
     fn run_pair(n: uint) {
-        // Create a stream A->B
-        let (atx, arx) = channel::<()>();
-        // Create a stream B->A
-        let (btx, brx) = channel::<()>();
+        // Create a channel: A->B
+        let (atx, arx) = channel();
+        // Create a channel: B->A
+        let (btx, brx) = channel();
 
         Thread::spawn(move|| {
             let (tx, rx) = (atx, brx);
             for _ in range(0, n) {
-                tx.send(());
-                rx.recv();
+                tx.send(()).unwrap();
+                rx.recv().unwrap();
             }
         }).detach();
 
         Thread::spawn(move|| {
             let (tx, rx) = (btx, arx);
             for _ in range(0, n) {
-                rx.recv();
-                tx.send(());
+                rx.recv().unwrap();
+                tx.send(()).unwrap();
             }
         }).detach();
     }
@@ -66,13 +64,13 @@ fn main() {
     let args = os::args();
     let args = args.as_slice();
     let n = if args.len() == 3 {
-        from_str::<uint>(args[1].as_slice()).unwrap()
+        args[1].parse::<uint>().unwrap()
     } else {
         10000
     };
 
     let m = if args.len() == 3 {
-        from_str::<uint>(args[2].as_slice()).unwrap()
+        args[2].parse::<uint>().unwrap()
     } else {
         4
     };