nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

lowering: extract lower_expr_try_block

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2019-08-10 15:09:18 +02:00
parent e450dcaf8e
commit 8ddd173811
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/librustc/hir/lowering/expr.rs
View File

@ -225,31 +225,7 @@ impl LoweringContext<'_> {
hir::LoopSource::Loop, hir::LoopSource::Loop,
) )
}), }),
ExprKind::TryBlock(ref body) => { ExprKind::TryBlock(ref body) => self.lower_expr_try_block(body),
self.with_catch_scope(body.id, |this| {
let unstable_span = this.mark_span_with_reason(
DesugaringKind::TryBlock,
body.span,
this.allow_try_trait.clone(),
);
let mut block = this.lower_block(body, true).into_inner();
let tail = block.expr.take().map_or_else(
|| {
let span = this.sess.source_map().end_point(unstable_span);
hir::Expr {
span,
node: hir::ExprKind::Tup(hir_vec![]),
attrs: ThinVec::new(),
hir_id: this.next_id(),
}
},
|x: P<hir::Expr>| x.into_inner(),
);
block.expr = Some(this.wrap_in_try_constructor(
sym::from_ok, tail, unstable_span));
hir::ExprKind::Block(P(block), None)
})
}
ExprKind::Match(ref expr, ref arms) => hir::ExprKind::Match( ExprKind::Match(ref expr, ref arms) => hir::ExprKind::Match(
P(self.lower_expr(expr)), P(self.lower_expr(expr)),
arms.iter().map(|x| self.lower_arm(x)).collect(), arms.iter().map(|x| self.lower_arm(x)).collect(),
@ -375,6 +351,23 @@ impl LoweringContext<'_> {
} }
} }
fn lower_expr_try_block(&mut self, body: &Block) -> hir::ExprKind {
self.with_catch_scope(body.id, |this| {
let unstable_span = this.mark_span_with_reason(
DesugaringKind::TryBlock,
body.span,
this.allow_try_trait.clone(),
);
let mut block = this.lower_block(body, true).into_inner();
let tail = block.expr.take().map_or_else(
|| this.expr_unit(this.sess.source_map().end_point(unstable_span)),
|x: P<hir::Expr>| x.into_inner(),
);
block.expr = Some(this.wrap_in_try_constructor(sym::from_ok, tail, unstable_span));
hir::ExprKind::Block(P(block), None)
})
}
/// Desugar `<expr>.await` into: /// Desugar `<expr>.await` into:
/// ```rust /// ```rust
/// { /// {