Skip to content

Commit 7fb35ef

Browse files
committed
---
yaml --- r: 44277 b: refs/heads/snap-stage3 c: b26d434 h: refs/heads/master i: 44275: 9879982 v: v3
1 parent 8c15d31 commit 7fb35ef

File tree

7 files changed

+11
-26
lines changed

7 files changed

+11
-26
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f0d0b5c116eb464544bd48cec116c1ec8908d04d
4+
refs/heads/snap-stage3: b26d434ad126c1ee35ca63c02ff3d9a243e3a00a
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/ty.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4289,8 +4289,7 @@ pub fn eval_repeat_count(tcx: ctxt,
42894289
count_expr: @ast::expr,
42904290
span: span)
42914291
-> uint {
4292-
match const_eval::eval_const_expr_partial(tcx, count_expr) {
4293-
Ok(ref const_val) => match *const_val {
4292+
match const_eval::eval_const_expr(tcx, count_expr) {
42944293
const_eval::const_int(count) => return count as uint,
42954294
const_eval::const_uint(count) => return count as uint,
42964295
const_eval::const_float(count) => {
@@ -4311,13 +4310,7 @@ pub fn eval_repeat_count(tcx: ctxt,
43114310
repeat count but found boolean");
43124311
return 0;
43134312
}
4314-
},
4315-
Err(*) => {
4316-
tcx.sess.span_err(span,
4317-
~"expected constant integer for repeat count \
4318-
but found variable");
4319-
return 0;
4320-
}
4313+
43214314
}
43224315
}
43234316

branches/snap-stage3/src/test/bench/graph500-bfs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// xfail-pretty
2+
13
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
24
// file at the top-level directory of this distribution and at
35
// http://rust-lang.org/COPYRIGHT.

branches/snap-stage3/src/test/bench/sudoku.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// xfail-pretty
2+
13
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
24
// file at the top-level directory of this distribution and at
35
// http://rust-lang.org/COPYRIGHT.

branches/snap-stage3/src/test/bench/task-perf-jargon-metal-smoke.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// xfail-pretty
2+
13
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
24
// file at the top-level directory of this distribution and at
35
// http://rust-lang.org/COPYRIGHT.

branches/snap-stage3/src/test/bench/task-perf-linked-failure.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// xfail-pretty
2+
13
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
24
// file at the top-level directory of this distribution and at
35
// http://rust-lang.org/COPYRIGHT.

branches/snap-stage3/src/test/compile-fail/repeat_count.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)