Persist attributes in macro (#20)

* works all the way

Signed-off-by: Yoshua Wuyts <[email protected]>

* upgrade juliex

Signed-off-by: Yoshua Wuyts <[email protected]>

* update all deps

Signed-off-by: Yoshua Wuyts <[email protected]>

Author: yoshuawuyts

Cargo.toml

@@ -13,7 +13,7 @@ categories = ["asynchronous", "network-programming", "filesystem", "concurrency"
 edition = "2018"
 
 [dependencies]
-futures-preview = { version = "0.3.0-alpha.15" }
+futures-preview = "0.3.0-alpha.15"
 runtime-attributes = { path = "runtime-attributes", version = "0.3.0-alpha.2" }
 runtime-raw = { path = "runtime-raw", version = "0.3.0-alpha.1" }
 runtime-native = { path = "runtime-native", version = "0.3.0-alpha.1" }
@@ -22,11 +22,11 @@ runtime-native = { path = "runtime-native", version = "0.3.0-alpha.1" }
 failure = "0.1.5"
 futures01 = { package = "futures", version = "0.1" }
 futures-preview = { version = "0.3.0-alpha.15", features = ["nightly", "async-await"] }
-juliex = "0.3.0-alpha.2"
+juliex = "0.3.0-alpha.5"
 mio = "0.6.16"
 rand = "0.6.5"
 runtime-tokio = { path = "runtime-tokio", version = "0.3.0-alpha.1" }
-tokio = "0.1.18"
+tokio = "0.1.19"
 
 [profile.bench]
 codegen-units = 1

runtime-attributes/Cargo.toml

@@ -16,9 +16,9 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-syn = { version = "0.15", features = ["full"] }
-proc-macro2 = { version = "0.4.24", features = ["nightly"] }
-quote = "0.6"
+syn = { version = "0.15.33", features = ["full"] }
+proc-macro2 = { version = "0.4.29", features = ["nightly"] }
+quote = "0.6.12"
 
 [dev-dependencies]
 runtime-raw = { path = "../runtime-raw", version = "0.3.0-alpha.1" }

runtime-attributes/src/lib.rs

@@ -34,8 +34,10 @@ pub fn main(attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = syn::parse_macro_input!(item as syn::ItemFn);
 
     let ret = &input.decl.output;
+    let inputs = &input.decl.inputs;
     let name = &input.ident;
     let body = &input.block;
+    let attrs = &input.attrs;
 
     if name != "main" {
         let tokens = quote_spanned! { name.span() =>
@@ -52,9 +54,17 @@ pub fn main(attr: TokenStream, item: TokenStream) -> TokenStream {
     }
 
     let result = quote! {
-      fn #name() #ret {
-        runtime::raw::enter(#rt, async { #body })
-      }
+        fn main() #ret {
+            #(#attrs)*
+            async fn main(#(#inputs),*) #ret {
+                #body
+            }
+
+            runtime::raw::enter(#rt, async {
+                await!(main())
+            })
+        }
+
     };
 
     result.into()
@@ -84,6 +94,7 @@ pub fn test(attr: TokenStream, item: TokenStream) -> TokenStream {
     let ret = &input.decl.output;
     let name = &input.ident;
     let body = &input.block;
+    let attrs = &input.attrs;
 
     if input.asyncness.is_none() {
         let tokens = quote_spanned! { input.span() =>
@@ -94,6 +105,7 @@ pub fn test(attr: TokenStream, item: TokenStream) -> TokenStream {
 
     let result = quote! {
       #[test]
+      #(#attrs)*
       fn #name() #ret {
         runtime::raw::enter(#rt, async { #body })
       }
@@ -128,6 +140,7 @@ pub fn bench(attr: TokenStream, item: TokenStream) -> TokenStream {
     let args = &input.decl.inputs;
     let name = &input.ident;
     let body = &input.block;
+    let attrs = &input.attrs;
 
     if input.asyncness.is_none() {
         let tokens = quote_spanned! { input.span() =>
@@ -145,6 +158,7 @@ pub fn bench(attr: TokenStream, item: TokenStream) -> TokenStream {
 
     let result = quote! {
       #[bench]
+      #(#attrs)*
       fn #name(b: &mut test::Bencher) {
         b.iter(|| {
           let _ = runtime::raw::enter(#rt, async { #body });

runtime-native/Cargo.toml

@@ -13,9 +13,9 @@ categories = ["asynchronous", "network-programming", "filesystem", "concurrency"
 edition = "2018"
 
 [dependencies]
-async-datagram = "2.0.0"
+async-datagram = "2.2.0"
 futures-preview = "0.3.0-alpha.15"
-lazy_static = "1.0.0"
-romio = "0.3.0-alpha.5"
+lazy_static = "1.3.0"
+romio = "0.3.0-alpha.6"
 runtime-raw = { path = "../runtime-raw", version = "0.3.0-alpha.1" }
-juliex = "0.3.0-alpha.3"
+juliex = "0.3.0-alpha.5"

runtime-native/src/lib.rs

@@ -38,7 +38,7 @@ pub struct Native;
 
 impl runtime_raw::Runtime for Native {
     fn spawn_boxed(&self, fut: BoxFuture<'static, ()>) -> Result<(), SpawnError> {
-        JULIEX_THREADPOOL.spawn_obj(fut.into());
+        JULIEX_THREADPOOL.spawn_boxed(fut.into());
         Ok(())
     }
 

runtime-tokio/Cargo.toml

@@ -15,7 +15,7 @@ edition = "2018"
 [dependencies]
 futures-preview = { version = "0.3.0-alpha.15", features = ["compat", "io-compat"] }
 futures01 = { package = "futures", version = "0.1" }
-lazy_static = "1.0.0"
+lazy_static = "1.3.0"
 mio = "0.6.16"
 runtime-raw = { path = "../runtime-raw", version = "0.3.0-alpha.1" }
-tokio = { version = "0.1" }
+tokio = "0.1.19"