From d4d17392fef4f6161cdfbfc4fbe1d0d05db020ad Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Thu, 29 Mar 2018 20:58:02 -0700
Subject: [PATCH] Remove println from tests (#267)

---
 tests/runtime.rs                     | 31 ++++++++++++----------------
 tokio-threadpool/tests/threadpool.rs |  2 --
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/tests/runtime.rs b/tests/runtime.rs
index ddda48607..309ad0d4d 100644
--- a/tests/runtime.rs
+++ b/tests/runtime.rs
@@ -1,11 +1,9 @@
-extern crate futures;
 extern crate tokio;
-extern crate tokio_io;
 extern crate env_logger;
 
-use futures::prelude::*;
+use tokio::io;
 use tokio::net::{TcpStream, TcpListener};
-use tokio_io::io;
+use tokio::prelude::*;
 
 macro_rules! t {
     ($e:expr) => (match $e {
@@ -18,35 +16,32 @@ macro_rules! t {
 fn basic_runtime_usage() {
     let _ = env_logger::init();
 
-    // TODO: Don't require the lazy wrapper
-    tokio::run(::futures::future::lazy(|| {
+    tokio::run({
         let server = t!(TcpListener::bind(&"127.0.0.1:0".parse().unwrap()));
         let addr = t!(server.local_addr());
         let client = TcpStream::connect(&addr);
 
         let server = server.incoming().take(1)
-            .map_err(|e| println!("accept err = {:?}", e))
+            .map_err(|e| panic!("accept err = {:?}", e))
             .for_each(|socket| {
                 tokio::spawn({
                     io::write_all(socket, b"hello")
-                        .map(|_| println!("write done"))
-                        .map_err(|e| println!("write err = {:?}", e))
+                        .map(|_| ())
+                        .map_err(|e| panic!("write err = {:?}", e))
                 })
             })
-            .map(|_| println!("accept done"));
+            .map(|_| ());
 
         let client = client
-            .map_err(|e| println!("connect err = {:?}", e))
+            .map_err(|e| panic!("connect err = {:?}", e))
             .and_then(|client| {
                 // Read all
                 io::read_to_end(client, vec![])
-                    .map(|_| println!("read done"))
-                    .map_err(|e| println!("read err = {:?}", e))
+                    .map(|_| ())
+                    .map_err(|e| panic!("read err = {:?}", e))
             });
 
-        tokio::spawn({
-            server.join(client)
-                .map(|_| println!("done"))
-        })
-    }));
+        server.join(client)
+            .map(|_| ())
+    });
 }
diff --git a/tokio-threadpool/tests/threadpool.rs b/tokio-threadpool/tests/threadpool.rs
index b881fc45e..24eaf6337 100644
--- a/tokio-threadpool/tests/threadpool.rs
+++ b/tokio-threadpool/tests/threadpool.rs
@@ -579,8 +579,6 @@ fn hammer() {
     }
 
     for i in 0.. ITER {
-        println!("~~~ ITER {} ~~~", i);
-
         let pool = Builder::new()
             // .pool_size(30)
             .build();