Remove unneeded early return from unit case

dtolnay · Mar 7, 2021 · 3596fe7 · 3596fe7
1 parent c8b4dc5
commit 3596fe7
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/expand.rs b/src/expand.rs
@@ -345,27 +345,21 @@ fn transform_block(sig: &mut Signature, block: &mut Block) {
     }
 
     let stmts = &block.stmts;
-    let ret = match &sig.output {
-        ReturnType::Default => quote!(()),
-        ReturnType::Type(_, ret) => quote!(#ret),
-    };
     let let_ret = match &sig.output {
         ReturnType::Default => quote_spanned! {block.brace_token.span=>
             let _: () = { #(#decls)* #(#stmts)* };
         },
         ReturnType::Type(_, ret) => quote_spanned! {block.brace_token.span=>
+            if let ::core::option::Option::Some(__ret) = ::core::option::Option::None::<#ret> {
+                return __ret;
+            }
             let __ret: #ret = { #(#decls)* #(#stmts)* };
             #[allow(unreachable_code)]
             __ret
         },
     };
     let box_pin = quote_spanned!(block.brace_token.span=>
-        Box::pin(async move {
-            if let ::core::option::Option::Some(__ret) = ::core::option::Option::None::<#ret> {
-                return __ret;
-            }
-            #let_ret
-        })
+        Box::pin(async move { #let_ret })
     );
     block.stmts = parse_quote!(#box_pin);
 }