---

pcwalton · pcwalton · commit abd04145f406 · 2011-07-07T19:08:59.000-07:00
yaml --- r: 3714 b: refs/heads/master c: 7ed556c h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2255eda6254e10582cd879d33f19159fe803cb23
+refs/heads/master: 7ed556cf8e3f6b7cb36e9e8cbb6be7e445b339c9
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1750,6 +1750,8 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
                 }
                 case (some(?e)) {
                     check_expr(fcx, e);
+                    demand::simple(fcx, expr.span, fcx.ret_ty,
+                                   expr_ty(fcx.ccx.tcx, e));
                     write::nil_ty(fcx.ccx.tcx, id);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 2255eda6254e10582cd879d33f19159fe803cb23`
	`2`	`+refs/heads/master: 7ed556cf8e3f6b7cb36e9e8cbb6be7e445b339c9`
Original file line number	Diff line number	Diff line change
`@@ -1750,6 +1750,8 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {`
`1750`	`1750`	`}`
`1751`	`1751`	`case (some(?e)) {`
`1752`	`1752`	`check_expr(fcx, e);`
	`1753`	`+ demand::simple(fcx, expr.span, fcx.ret_ty,`
	`1754`	`+ expr_ty(fcx.ccx.tcx, e));`
`1753`	`1755`	`write::nil_ty(fcx.ccx.tcx, id);`
`1754`	`1756`	`}`
`1755`	`1757`	`}`