---

nikomatsakis · nikomatsakis · commit cf66dcbe19fb · 2014-12-22T12:27:07.000-05:00
yaml --- r: 165547 b: refs/heads/master c: 211782f h: refs/heads/master i: 165545: 5483dfe 165543: ca8f5e6 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 39be95c16ba3d8ed7aa5253f36c5009acb37404b
+refs/heads/master: 211782fef562cac25922080229fd8443fb352792
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b
diff --git a/trunk/src/librustc_typeck/check/mod.rs b/trunk/src/librustc_typeck/check/mod.rs
@@ -3867,7 +3867,7 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
         }
 
         let lhs_ty = fcx.expr_ty(&**lhs);
-        check_expr_has_type(fcx, &**rhs, lhs_ty);
+        check_expr_coercable_to_type(fcx, &**rhs, lhs_ty);
         let rhs_ty = fcx.expr_ty(&**rhs);
 
         fcx.require_expr_have_sized_type(&**lhs, traits::AssignmentLhsSized);

Original file line number	Diff line number	Diff line change
`@@ -3867,7 +3867,7 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,`
`3867`	`3867`	`}`
`3868`	`3868`
`3869`	`3869`	`let lhs_ty = fcx.expr_ty(&**lhs);`
`3870`		`- check_expr_has_type(fcx, &**rhs, lhs_ty);`
	`3870`	`+ check_expr_coercable_to_type(fcx, &**rhs, lhs_ty);`
`3871`	`3871`	`let rhs_ty = fcx.expr_ty(&**rhs);`
`3872`	`3872`
`3873`	`3873`	`fcx.require_expr_have_sized_type(&**lhs, traits::AssignmentLhsSized);`