nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 20:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate IsAsync::Async match

Browse Source
This commit is contained in:
Oliver Schneider 2018-06-27 17:32:48 +02:00
parent acf50b79be
commit 82091d421a
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/librustc/hir/lowering.rs
View File

@ -2520,6 +2520,28 @@ impl<'a> LoweringContext<'a> {
}) })
} }
fn lower_async_body(
&mut self,
decl: &FnDecl,
asyncness: IsAsync,
body: &Block,
) -> hir::BodyId {
self.lower_body(Some(decl), |this| {
if let IsAsync::Async(async_node_id) = asyncness {
let async_expr = this.make_async_expr(
CaptureBy::Value, async_node_id, None,
|this| {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
});
this.expr(body.span, async_expr, ThinVec::new())
} else {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
}
})
}
fn lower_item_kind( fn lower_item_kind(
&mut self, &mut self,
id: NodeId, id: NodeId,
@ -2559,20 +2581,7 @@ impl<'a> LoweringContext<'a> {
// `impl Future<Output = T>` here because lower_body // `impl Future<Output = T>` here because lower_body
// only cares about the input argument patterns in the function // only cares about the input argument patterns in the function
// declaration (decl), not the return types. // declaration (decl), not the return types.
let body_id = this.lower_body(Some(decl), |this| { let body_id = this.lower_async_body(decl, header.asyncness, body);
if let IsAsync::Async { closure_id, .. } = header.asyncness {
let async_expr = this.make_async_expr(
CaptureBy::Value, closure_id, None,
|this| {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
});
this.expr(body.span, async_expr, ThinVec::new())
} else {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
}
});
let (generics, fn_decl) = this.add_in_band_defs( let (generics, fn_decl) = this.add_in_band_defs(
generics, generics,
@ -2990,20 +2999,7 @@ impl<'a> LoweringContext<'a> {
) )
} }
ImplItemKind::Method(ref sig, ref body) => { ImplItemKind::Method(ref sig, ref body) => {
let body_id = self.lower_body(Some(&sig.decl), |this| { let body_id = self.lower_async_body(&sig.decl, sig.header.asyncness, body);
if let IsAsync::Async { closure_id, .. } = sig.header.asyncness {
let async_expr = this.make_async_expr(
CaptureBy::Value, closure_id, None,
|this| {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
});
this.expr(body.span, async_expr, ThinVec::new())
} else {
let body = this.lower_block(body, false);
this.expr_block(body, ThinVec::new())
}
});
let impl_trait_return_allow = !self.is_in_trait_impl; let impl_trait_return_allow = !self.is_in_trait_impl;
self.add_in_band_defs( self.add_in_band_defs(