From 680e858d612fe9da436194dacdf2987ece9ada03 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 16 Dec 2010 12:25:39 -0800 Subject: [PATCH] rustc: Write types back when typechecking "ret" statements --- src/comp/middle/typeck.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index 332c893e841..2529ab29c2f 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -2236,10 +2236,10 @@ fn check_stmt(&fn_ctxt fcx, &@ast.stmt stmt) } case (some[@ast.expr](?expr)) { - auto expr_t = check_expr(fcx, expr); - demand(fcx, expr.span, fcx.ret_ty, expr_ty(expr_t)); + auto expr_0 = check_expr(fcx, expr); + auto expr_1 = demand_expr(fcx, fcx.ret_ty, expr_0); ret @fold.respan[ast.stmt_](stmt.span, - ast.stmt_ret(some(expr_t))); + ast.stmt_ret(some(expr_1))); } } }