mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only lower async fn body if it actually has a body

Browse Source
This commit is contained in:
Michael Goulet 2022-09-24 19:22:01 +00:00
parent 730ead8047
commit e99f6fee44
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_ast_lowering/src/item.rs
View File

@ -1055,9 +1055,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
asyncness: Async, asyncness: Async,
body: Option<&Block>, body: Option<&Block>,
) -> hir::BodyId { ) -> hir::BodyId {
let closure_id = match asyncness { let (closure_id, body) = match (asyncness, body) {
Async::Yes { closure_id, .. } => closure_id, (Async::Yes { closure_id, .. }, Some(body)) => (closure_id, body),
Async::No => return self.lower_fn_body_block(span, decl, body), _ => return self.lower_fn_body_block(span, decl, body),
}; };
self.lower_body(|this| { self.lower_body(|this| {
@ -1199,16 +1199,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
parameters.push(new_parameter); parameters.push(new_parameter);
} }
let body_span = body.map_or(span, |b| b.span);
let async_expr = this.make_async_expr( let async_expr = this.make_async_expr(
CaptureBy::Value, CaptureBy::Value,
closure_id, closure_id,
None, None,
body_span, body.span,
hir::AsyncGeneratorKind::Fn, hir::AsyncGeneratorKind::Fn,
|this| { |this| {
// Create a block from the user's function body: // Create a block from the user's function body:
let user_body = this.lower_block_expr_opt(body_span, body); let user_body = this.lower_block_expr(body);
// Transform into `drop-temps { <user-body> }`, an expression: // Transform into `drop-temps { <user-body> }`, an expression:
let desugared_span = let desugared_span =
@ -1240,7 +1239,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
( (
this.arena.alloc_from_iter(parameters), this.arena.alloc_from_iter(parameters),
this.expr(body_span, async_expr, AttrVec::new()), this.expr(body.span, async_expr, AttrVec::new()),
) )
}) })
} }