bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #81865 - bugadani:typeck2, r=jyn514

Browse source 
Clean up weird Option mapping
This commit is contained in:
Mara Bos 2021-02-08 19:28:25 +01:00 • committed by GitHub
commit 9d1e8fe045
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_typeck/src/check/expr.rs
View file

@ -285,13 +285,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.check_expr_eq_type(&e, ty);
ty
}
ExprKind::If(ref cond, ref then_expr, ref opt_else_expr) => self.check_then_else(
&cond,
then_expr,
opt_else_expr.as_ref().map(|e| &**e),
expr.span,
expected,
),
ExprKind::If(cond, then_expr, opt_else_expr) => {
self.check_then_else(cond, then_expr, opt_else_expr, expr.span, expected)
}
ExprKind::DropTemps(ref e) => self.check_expr_with_expectation(e, expected),
ExprKind::Array(ref args) => self.check_expr_array(args, expected, expr),
ExprKind::ConstBlock(ref anon_const) => self.to_const(anon_const).ty,