aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-12-16 12:25:39 -0800
committerPatrick Walton <[email protected]>2010-12-16 12:25:39 -0800
commit680e858d612fe9da436194dacdf2987ece9ada03 (patch)
treeccee45c66f521391e0352bc791cc7223a371d1f1 /src
parentrustc: Make trans.type_of handle parameter types (diff)
downloadrust-680e858d612fe9da436194dacdf2987ece9ada03.tar.xz
rust-680e858d612fe9da436194dacdf2987ece9ada03.zip
rustc: Write types back when typechecking "ret" statements
Diffstat (limited to 'src')
-rw-r--r--src/comp/middle/typeck.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 332c893e..2529ab29 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)));
}
}
}