Drop async move hack

elpiel · May 7, 2019 · efeecb6 · efeecb6
1 parent 16e4f02
commit efeecb6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 34 deletions.
diff --git a/tower-web-macros/src/resource/resource.rs b/tower-web-macros/src/resource/resource.rs
@@ -118,8 +118,6 @@ impl Resource {
         let match_extract = self.match_extract();
         let match_into_response = self.match_into_response();
 
-        let async_helper_macro = self.async_helper_macro();
-
         // Define `Resource` on the struct.
         quote! {
             macro_rules! try_ready {
@@ -134,8 +132,6 @@ impl Resource {
                 }}
             }
 
-            #async_helper_macro
-
             pub struct __GeneratedResource<S, B, T>
             where S: __tw::response::Serializer,
                   B: __tw::util::BufStream,
@@ -783,27 +779,6 @@ impl Resource {
         })
     }
 
-    fn async_helper_macro(&self) -> TokenStream {
-        if self.is_async() {
-            // Works around limitations around emiting 2018 syntax in current Rust.
-            quote! {
-                macro_rules! async_move_hax {
-                    ($e:expr) => {
-                        async move { $e }
-                    }
-                }
-            }
-        } else {
-            quote!()
-        }
-    }
-
-    /// Returns true if at least one route is an async fn.
-    fn is_async(&self) -> bool {
-        self.routes.iter()
-            .any(|route| route.is_async())
-    }
-
     /// The resource's future type
     fn handler_future_ty(&self) -> TokenStream {
         TyTree::new(&self.routes[..])

diff --git a/tower-web-macros/src/resource/route.rs b/tower-web-macros/src/resource/route.rs
@@ -30,10 +30,6 @@ impl Route {
         self.sig.args()
     }
 
-    pub fn is_async(&self) -> bool {
-        self.sig.is_async()
-    }
-
     pub fn template(&self) -> Option<&str> {
         self.attributes.template()
     }

diff --git a/tower-web-macros/src/resource/signature.rs b/tower-web-macros/src/resource/signature.rs
@@ -60,10 +60,6 @@ impl Signature {
         &self.ret
     }
 
-    pub fn is_async(&self) -> bool {
-        self.is_async
-    }
-
     /// The response future type
     pub fn future_ty(&self) -> TokenStream {
         let ty = self.ret();
@@ -87,7 +83,7 @@ impl Signature {
 
             quote! {
                 let inner = #inner.clone();
-                let ret: #ty = __tw::codegen::async_await::async_to_box_future_send(async_move_hax! {
+                let ret: #ty = __tw::codegen::async_await::async_to_box_future_send(async move {
                     r#await!(inner.handler.#ident(#(#args),*))
                 });
                 ret