Skip to content

Commit a44297d

Browse files
committed
---
yaml --- r: 12227 b: refs/heads/master c: f682b99 h: refs/heads/master i: 12225: f39c0cd 12223: 09bdeb9 v: v3
1 parent 698b3cc commit a44297d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 76d0a13ae5a82aaaa1eff409d873cca29bdcb88e
2+
refs/heads/master: f682b99e36b8963890c3280c784f88274de55267
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/typeck.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2414,8 +2414,8 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
24142414
// A generic function for checking assignment expressions
24152415
fn check_assignment(fcx: @fn_ctxt, _sp: span, lhs: @ast::expr,
24162416
rhs: @ast::expr, id: ast::node_id) -> bool {
2417-
let t = next_ty_var(fcx);
2418-
let bot = check_expr_with(fcx, lhs, t) | check_expr_with(fcx, rhs, t);
2417+
let mut bot = check_expr(fcx, lhs);
2418+
bot |= check_expr_with(fcx, rhs, expr_ty(fcx.ccx.tcx, lhs));
24192419
write_ty(fcx.ccx.tcx, id, ty::mk_nil(fcx.ccx.tcx));
24202420
ret bot;
24212421
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
fn main() {
2+
let mut x: [mut int] = [mut 3];
3+
let y: [int] = [3];
4+
x = y; //! ERROR values differ in mutability
5+
}

0 commit comments

Comments
 (0)