---

pcwalton · pcwalton · commit b3902c3c93cb · 2011-04-14T15:28:50.000-07:00
yaml --- r: 2107 b: refs/heads/master c: 0387b5a h: refs/heads/master i: 2105: a324854 2103: c4efcd5 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ab187c9cbffc3b938b40032c6031202c3d8f50
+refs/heads/master: 0387b5a060a1ca3484cfb130bc589f1470afa13a
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1696,7 +1696,7 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
         auto lhs_1 = Pushdown.pushdown_expr(fcx, rhs_t0, lhs_0);
         auto rhs_1 = Pushdown.pushdown_expr(fcx, expr_ty(lhs_1), rhs_0);
 
-        auto ann = triv_ann(rhs_t0);
+        auto ann = triv_ann(expr_ty(rhs_1));
         ret tup(lhs_1, rhs_1, ann);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 55ab187c9cbffc3b938b40032c6031202c3d8f50`
	`2`	`+refs/heads/master: 0387b5a060a1ca3484cfb130bc589f1470afa13a`
Original file line number	Diff line number	Diff line change
`@@ -1696,7 +1696,7 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr {`
`1696`	`1696`	`auto lhs_1 = Pushdown.pushdown_expr(fcx, rhs_t0, lhs_0);`
`1697`	`1697`	`auto rhs_1 = Pushdown.pushdown_expr(fcx, expr_ty(lhs_1), rhs_0);`
`1698`	`1698`
`1699`		`- auto ann = triv_ann(rhs_t0);`
	`1699`	`+ auto ann = triv_ann(expr_ty(rhs_1));`
`1700`	`1700`	`ret tup(lhs_1, rhs_1, ann);`
`1701`	`1701`	`}`
`1702`	`1702`