Skip to content

Commit 882f0be

Browse files
committed
---
yaml --- r: 51451 b: refs/heads/incoming c: 8b66578 h: refs/heads/master i: 51449: 0938f92 51447: 91a16cf v: v3
1 parent 1bb0f13 commit 882f0be

File tree

2 files changed

+3
-3
lines changed
  • branches/incoming/src/librustc/middle/typeck/check

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 787f5bb0dbbbd50f59848f6703bd89438e60053f
9+
refs/heads/incoming: 8b66578e66957dfdbfed60634e0c7661213e442f
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/typeck/check/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
21692169
}
21702170
ast::expr_repeat(element, count_expr, mutbl) => {
21712171
let count = ty::eval_repeat_count(tcx, count_expr);
2172-
fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
2172+
check_expr_with_hint(fcx, count_expr, ty::mk_uint(tcx));
21732173
let tt = ast_expr_vstore_to_vstore(fcx, ev, count, vst);
21742174
let t: ty::t = fcx.infcx().next_ty_var();
21752175
bot |= check_expr_has_type(fcx, element, t);
@@ -2537,7 +2537,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
25372537
}
25382538
ast::expr_repeat(element, count_expr, mutbl) => {
25392539
let count = ty::eval_repeat_count(tcx, count_expr);
2540-
fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
2540+
check_expr_with_hint(fcx, count_expr, ty::mk_uint(tcx));
25412541
let t: ty::t = fcx.infcx().next_ty_var();
25422542
bot |= check_expr_has_type(fcx, element, t);
25432543
let t = ty::mk_evec(tcx, ty::mt {ty: t, mutbl: mutbl},

0 commit comments

Comments
 (0)