bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address review comments

Browse source 
Co-authored-by: Léo Lanteri Thauvin <leseulartichaut@gmail.com>
This commit is contained in:
mibac138 2020-12-17 13:24:51 +01:00 • committed by LeSeulArtichaut
parent 98ad0af60b
commit e603f994b1
3 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_typeck/src/check/demand.rs
View file

@ -366,16 +366,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
false
}
crate fn hir_id_sole_block_element(
&self,
hir_id: hir::HirId,
) -> Option<&'tcx rustc_hir::Expr<'tcx>> {
let node: Option<Node<'_>> = self.tcx.hir().find(hir_id);
match node {
Some(Node::Expr(rustc_hir::Expr {
kind: rustc_hir::ExprKind::Block(block, ..),
..
})) if block.stmts.len() == 0 => block.expr,
/// If the given `HirId` corresponds to a block with a trailing expression, return that expression
crate fn maybe_get_block_expr(&self, hir_id: hir::HirId) -> Option<&'tcx hir::Expr<'tcx>> {
match self.tcx.hir().find(hir_id)? {
Node::Expr(hir::Expr { kind: hir::ExprKind::Block(block, ..), .. }) => block.expr,
_ => None,
}
}
@ -666,9 +660,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
};
let suggestion = if is_struct_pat_shorthand_field {
format!("{}: *{}", code, code)
} else if let Some(expr) =
self.hir_id_sole_block_element(expr.hir_id)
{
} else if let Some(expr) = self.maybe_get_block_expr(expr.hir_id) {
if let Ok(inner_code) = sm.span_to_snippet(expr.span) {
format!("*{}", inner_code)
} else {