refactor(rt): remove re-export of tokio::main (#1879)

tesaguri · seanmonstar · commit 0d3cbe28fc59 · 2019-07-22T10:06:36.000-07:00
Closes #1878. BREAKING CHANGE: Replace all usage of `rt::main` with `tokio::main`.
diff --git a/examples/client.rs b/examples/client.rs
@@ -11,7 +11,7 @@ use hyper::Client;
 // A simple type alias so as to DRY.
 type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() -> Result<()> {
     pretty_env_logger::init();
 
diff --git a/examples/client_json.rs b/examples/client_json.rs
@@ -12,7 +12,7 @@ use futures_util::TryStreamExt;
 // A simple type alias so as to DRY.
 type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() -> Result<()> {
     let url = "http://jsonplaceholder.typicode.com/users".parse().unwrap();
     let users = fetch_json(url).await?;
diff --git a/examples/hello.rs b/examples/hello.rs
@@ -8,7 +8,7 @@ async fn hello(_: Request<Body>) -> Result<Response<Body>, hyper::Error> {
     Ok(Response::new(Body::from("Hello World!")))
 }
 
-#[hyper::rt::main]
+#[tokio::main]
 pub async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     pretty_env_logger::init();
 
diff --git a/examples/multi_server.rs b/examples/multi_server.rs
@@ -18,7 +18,7 @@ async fn index2(_: Request<Body>) -> Result<Response<Body>, hyper::Error> {
     Ok(Response::new(Body::from(INDEX2)))
 }
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     pretty_env_logger::init();
 
diff --git a/examples/params.rs b/examples/params.rs
@@ -80,7 +80,7 @@ async fn param_example(req: Request<Body>) -> Result<Response<Body>, hyper::Erro
     }
 }
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     pretty_env_logger::init();
 
diff --git a/examples/proxy.rs b/examples/proxy.rs
@@ -5,7 +5,7 @@ use hyper::{Client, Error, Server};
 use hyper::service::{make_service_fn, service_fn};
 use std::net::SocketAddr;
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() {
     pretty_env_logger::init();
 
diff --git a/examples/send_file.rs b/examples/send_file.rs
@@ -11,7 +11,7 @@ static INDEX: &str = "examples/send_file_index.html";
 static INTERNAL_SERVER_ERROR: &[u8] = b"Internal Server Error";
 static NOTFOUND: &[u8] = b"Not Found";
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() {
     pretty_env_logger::init();
 
diff --git a/examples/single_threaded.rs b/examples/single_threaded.rs
@@ -10,7 +10,7 @@ use tokio::runtime::current_thread;
 
 // Configure a runtime that runs everything on the current thread,
 // which means it can spawn !Send futures...
-#[hyper::rt::main(single_thread)]
+#[tokio::main(single_thread)]
 async fn main() {
     pretty_env_logger::init();
 
diff --git a/examples/state.rs b/examples/state.rs
@@ -6,7 +6,7 @@ use std::sync::{Arc, atomic::{AtomicUsize, Ordering}};
 use hyper::{Body, Error, Response, Server};
 use hyper::service::{make_service_fn, service_fn};
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() {
     pretty_env_logger::init();
 
diff --git a/examples/upgrades.rs b/examples/upgrades.rs
@@ -109,7 +109,7 @@ async fn client_upgrade_request(addr: SocketAddr) -> Result<()> {
     Ok(())
 }
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() {
     // For this example, we just make a server and our own client to talk to
     // it, so the exact port isn't important. Instead, let the OS give us an
diff --git a/examples/web_api.rs b/examples/web_api.rs
@@ -98,7 +98,7 @@ async fn response_examples(
     }
 }
 
-#[hyper::rt::main]
+#[tokio::main]
 async fn main() -> Result<()> {
     pretty_env_logger::init();
 
diff --git a/src/rt.rs b/src/rt.rs
@@ -9,10 +9,6 @@
 pub use std::future::Future;
 pub use futures_core::Stream;
 
-use tokio;
-
-pub use tokio::main;
-
 use self::inner::Spawn;
 
 /// Spawns a future on the default executor.
diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -24,7 +24,7 @@
 //! use hyper::service::{make_service_fn, service_fn};
 //!
 //! # #[cfg(feature = "runtime")]
-//! # #[hyper::rt::main]
+//! # #[tokio::main]
 //! async fn main() {
 //!     // Construct our SocketAddr to listen on...
 //!     let addr = ([127, 0, 0, 1], 3000).into();
@@ -379,7 +379,7 @@ impl<I, E> Builder<I, E> {
     /// # #[cfg(not(feature = "runtime"))]
     /// # fn main() {}
     /// # #[cfg(feature = "runtime")]
-    /// # #[hyper::rt::main]
+    /// # #[tokio::main]
     /// # async fn main() {
     /// use hyper::{Body, Error, Response, Server};
     /// use hyper::service::{make_service_fn, service_fn};
diff --git a/src/service/make_service.rs b/src/service/make_service.rs
@@ -120,7 +120,7 @@ where
 /// ```rust,no_run
 /// # #![feature(async_await)]
 /// # #[cfg(feature = "runtime")]
-/// # #[hyper::rt::main]
+/// # #[tokio::main]
 /// # async fn main() {
 /// use std::net::TcpStream;
 /// use hyper::{Body, Error, Request, Response, Server};

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ async fn hello(_: Request<Body>) -> Result<Response<Body>, hyper::Error> {`
`8`	`8`	`Ok(Response::new(Body::from("Hello World!")))`
`9`	`9`	`}`
`10`	`10`
`11`		`-#[hyper::rt::main]`
	`11`	`+#[tokio::main]`
`12`	`12`	`pub async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {`
`13`	`13`	`pretty_env_logger::init();`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ async fn index2(_: Request<Body>) -> Result<Response<Body>, hyper::Error> {`
`18`	`18`	`Ok(Response::new(Body::from(INDEX2)))`
`19`	`19`	`}`
`20`	`20`
`21`		`-#[hyper::rt::main]`
	`21`	`+#[tokio::main]`
`22`	`22`	`async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {`
`23`	`23`	`pretty_env_logger::init();`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ async fn param_example(req: Request<Body>) -> Result<Response<Body>, hyper::Erro`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`-#[hyper::rt::main]`
	`83`	`+#[tokio::main]`
`84`	`84`	`async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {`
`85`	`85`	`pretty_env_logger::init();`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ async fn client_upgrade_request(addr: SocketAddr) -> Result<()> {`
`109`	`109`	`Ok(())`
`110`	`110`	`}`
`111`	`111`
`112`		`-#[hyper::rt::main]`
	`112`	`+#[tokio::main]`
`113`	`113`	`async fn main() {`
`114`	`114`	`// For this example, we just make a server and our own client to talk to`
`115`	`115`	`// it, so the exact port isn't important. Instead, let the OS give us an`