Update Tokio to Rust 2018 (#1082)

tokio-buf/tests/buf_stream.rs

@@ -1,7 +1,5 @@
-extern crate tokio_buf;
-
 use tokio_buf::BufStream;
 
 // Ensures that `BufStream` can be a trait object
 #[allow(dead_code)]
-fn obj(_: &mut BufStream<Item = u32, Error = ()>) {}
+fn obj(_: &mut dyn BufStream<Item = u32, Error = ()>) {}

tokio-buf/tests/chain.rs

@@ -1,15 +1,9 @@
 #![cfg(feature = "util")]
 
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use futures::Async::*;
 use tokio_buf::{BufStream, BufStreamExt};
 
-#[macro_use]
 mod support;
-
 use support::*;
 
 #[test]

tokio-buf/tests/collect.rs

@@ -1,16 +1,10 @@
 #![cfg(feature = "util")]
 
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use bytes::Bytes;
 use futures::Future;
 use tokio_buf::BufStreamExt;
 
-#[macro_use]
 mod support;
-
 use support::*;
 
 macro_rules! test_collect_impl {

tokio-buf/tests/iter.rs

@@ -1,12 +1,7 @@
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use futures::Async::*;
 use std::io::Cursor;
 use tokio_buf::{util, BufStream};
 
-#[macro_use]
 mod support;
 
 type Buf = Cursor<&'static [u8]>;

tokio-buf/tests/limit.rs

@@ -1,16 +1,10 @@
 #![cfg(feature = "util")]
 
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use futures::Async::*;
 use futures::Future;
 use tokio_buf::{BufStream, BufStreamExt};
 
-#[macro_use]
 mod support;
-
 use support::*;
 
 #[test]

tokio-buf/tests/size_hint.rs

@@ -1,5 +1,3 @@
-extern crate tokio_buf;
-
 use tokio_buf::SizeHint;
 
 #[test]

tokio-buf/tests/stream.rs

@@ -1,15 +1,9 @@
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-extern crate tokio_mock_task;
-
 use futures::sync::mpsc;
 use futures::Async::*;
 use std::io::Cursor;
 use tokio_buf::{util, BufStream};
 use tokio_mock_task::MockTask;
 
-#[macro_use]
 mod support;
 
 type Buf = Cursor<&'static [u8]>;

tokio-buf/tests/string.rs

@@ -1,12 +1,7 @@
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use futures::Async::*;
 use std::fmt;
 use tokio_buf::BufStream;
 
-#[macro_use]
 mod support;
 
 fn test_hello_world<B>(mut bs: B)

tokio-buf/tests/support.rs

@@ -1,9 +1,5 @@
 #![allow(unused)]
 
-extern crate bytes;
-extern crate futures;
-extern crate tokio_buf;
-
 use bytes::Buf;
 use futures::Async::*;
 use futures::Poll;
@@ -12,6 +8,7 @@ use tokio_buf::{BufStream, SizeHint};
 use std::collections::VecDeque;
 use std::io::Cursor;
 
+#[macro_export]
 macro_rules! assert_buf_eq {
     ($actual:expr, $expect:expr) => {{
         use bytes::Buf;
@@ -27,6 +24,7 @@ macro_rules! assert_buf_eq {
     }};
 }
 
+#[macro_export]
 macro_rules! assert_none {
     ($actual:expr) => {
         match $actual {
@@ -36,6 +34,7 @@ macro_rules! assert_none {
     };
 }
 
+#[macro_export]
 macro_rules! assert_not_ready {
     ($actual:expr) => {
         match $actual {