macros: re-export main macro from tokio (#1198)

Includes minor fixes and a very basic example.

Fixes #1183
This commit is contained in:
Carl Lerche
2019-06-25 20:14:21 -07:00
committed by GitHub
parent 455782b964
commit dc5fa80a09
6 changed files with 13 additions and 6 deletions
+2 -1
View File
@@ -48,6 +48,7 @@ rt-full = [
# "timer",
"tokio-current-thread",
"tokio-executor",
"tokio-macros",
# "tokio-threadpool",
# "tokio-trace-core",
]
@@ -69,7 +70,7 @@ tokio-current-thread = { version = "0.2.0", optional = true, path = "../tokio-cu
#tokio-fs = { version = "0.2.0", optional = true, path = "../tokio-fs" }
tokio-io = { version = "0.2.0", optional = true, path = "../tokio-io" }
tokio-executor = { version = "0.2.0", optional = true, path = "../tokio-executor" }
#tokio-macros = { version = "0.1.0", optional = true, path = "../tokio-macros" }
tokio-macros = { version = "0.1.0", optional = true, path = "../tokio-macros" }
tokio-reactor = { version = "0.2.0", optional = true, path = "../tokio-reactor" }
tokio-sync = { version = "0.2.0", optional = true, path = "../tokio-sync" }
#tokio-threadpool = { version = "0.2.0", optional = true, path = "../tokio-threadpool" }
+3
View File
@@ -99,4 +99,7 @@ if_runtime! {
pub use crate::executor::spawn;
pub use crate::runtime::run;
#[cfg(not(test))] // Work around for rust-lang/rust#62127
pub use tokio_macros::main;
}