Update Tokio to Rust 2018 (#1082)

tokio-sync/tests/atomic_task.rs

@@ -1,8 +1,4 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
 use futures::task::{self, Task};
 use tokio_mock_task::*;

tokio-sync/tests/errors.rs

@@ -1,6 +1,4 @@
-#![deny(warnings)]
-
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
 fn is_error<T: ::std::error::Error + Send + Sync>() {}
 

tokio-sync/tests/fuzz_atomic_task.rs

@@ -1,6 +1,5 @@
-#![deny(warnings)]
+#![deny(warnings, rust_2018_idioms)]
 
-extern crate futures;
 #[macro_use]
 extern crate loom;
 
@@ -8,15 +7,12 @@ extern crate loom;
 #[path = "../src/task/atomic_task.rs"]
 mod atomic_task;
 
-use atomic_task::AtomicTask;
-
+use crate::atomic_task::AtomicTask;
+use futures::future::poll_fn;
+use futures::Async;
 use loom::futures::block_on;
 use loom::sync::atomic::AtomicUsize;
 use loom::thread;
-
-use futures::future::poll_fn;
-use futures::Async;
-
 use std::sync::atomic::Ordering::Relaxed;
 use std::sync::Arc;
 

tokio-sync/tests/fuzz_list.rs

@@ -1,6 +1,5 @@
-#![deny(warnings)]
+#![deny(warnings, rust_2018_idioms)]
 
-extern crate futures;
 #[macro_use]
 extern crate loom;
 
@@ -21,12 +20,11 @@ mod block;
 const BLOCK_CAP: usize = 2;
 
 use loom::thread;
-
 use std::sync::Arc;
 
 #[test]
 fn smoke() {
-    use block::Read::*;
+    use crate::block::Read::*;
 
     const NUM_TX: usize = 2;
     const NUM_MSG: usize = 2;

tokio-sync/tests/fuzz_mpsc.rs

@@ -1,4 +1,5 @@
-extern crate futures;
+#![deny(warnings, rust_2018_idioms)]
+
 #[macro_use]
 extern crate loom;
 

tokio-sync/tests/fuzz_oneshot.rs

@@ -1,13 +1,11 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate loom;
+#![deny(warnings, rust_2018_idioms)]
 
 #[path = "../src/oneshot.rs"]
 #[allow(warnings)]
 mod oneshot;
 
-use futures::{Async, Future};
+use futures::{self, Async, Future};
+use loom;
 use loom::futures::block_on;
 use loom::thread;
 

tokio-sync/tests/fuzz_semaphore.rs

@@ -1,7 +1,5 @@
-#![deny(warnings)]
+#![deny(warnings, rust_2018_idioms)]
 
-#[macro_use]
-extern crate futures;
 #[macro_use]
 extern crate loom;
 
@@ -9,12 +7,10 @@ extern crate loom;
 #[allow(warnings)]
 mod semaphore;
 
-use semaphore::*;
-
-use futures::{future, Async, Future, Poll};
+use crate::semaphore::*;
+use futures::{future, try_ready, Async, Future, Poll};
 use loom::futures::block_on;
 use loom::thread;
-
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::SeqCst;
 use std::sync::Arc;

tokio-sync/tests/lock.rs

@@ -1,9 +1,6 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
+use futures;
 use tokio_mock_task::*;
 use tokio_sync::lock::Lock;
 

tokio-sync/tests/mpsc.rs

@@ -1,16 +1,11 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
-
-use tokio_mock_task::*;
-use tokio_sync::mpsc;
+#![deny(warnings, rust_2018_idioms)]
 
+use futures;
 use futures::prelude::*;
-
 use std::sync::Arc;
 use std::thread;
+use tokio_mock_task::*;
+use tokio_sync::mpsc;
 
 trait AssertSend: Send {}
 impl AssertSend for mpsc::Sender<i32> {}

tokio-sync/tests/oneshot.rs

@@ -1,14 +1,10 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
+use futures;
+use futures::prelude::*;
 use tokio_mock_task::*;
 use tokio_sync::oneshot;
 
-use futures::prelude::*;
-
 macro_rules! assert_ready {
     ($e:expr) => {{
         match $e {

tokio-sync/tests/semaphore.rs

@@ -1,9 +1,6 @@
-#![deny(warnings)]
-
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
+use futures;
 use tokio_mock_task::*;
 use tokio_sync::semaphore::{Permit, Semaphore};
 

tokio-sync/tests/watch.rs

@@ -1,7 +1,6 @@
-extern crate futures;
-extern crate tokio_mock_task;
-extern crate tokio_sync;
+#![deny(warnings, rust_2018_idioms)]
 
+use futures;
 use tokio_mock_task::*;
 use tokio_sync::watch;