---

yaml
---
r: 195523
b: refs/heads/master
c: 2243a2c
h: refs/heads/master
i:
  195521: 371b891
  195519: e04daae
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1973f7ebe5c67ef9ed57f7a64781d13868a70d3d
+refs/heads/master: 2243a2cceddd6c9708e3d296b5375da72a6b3d2a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
 refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/src/librustc_trans/trans/consts.rs

@@ -772,19 +772,7 @@ fn const_expr_unadjusted<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
           ast::ExprRepeat(ref elem, ref count) => {
             let unit_ty = ty::sequence_element_type(cx.tcx(), ety);
             let llunitty = type_of::type_of(cx, unit_ty);
-            let n = match const_eval::eval_const_expr_partial(cx.tcx(), &**count, None) {
-                Ok(const_eval::const_int(i))  => i as usize,
-                Ok(const_eval::const_uint(i)) => i as usize,
-                Ok(_) => {
-                    cx.sess().span_bug(count.span, "count must be integral const expression.")
-                }
-                Err(err) => {
-                    cx.sess().span_err(count.span, &format!("error evaluating count: {}",
-                                                            err.description()));
-                    // return 1 to allow compilation to proceed
-                    1 as usize
-                }
-            };
+            let n = ty::eval_repeat_count(cx.tcx(), count);
             let unit_val = const_expr(cx, &**elem, param_substs).0;
             let vs: Vec<_> = repeat(unit_val).take(n).collect();
             if val_ty(unit_val) != llunitty {