Skip to content

Commit 30bb35e

Browse files
committed
---
yaml --- r: 31157 b: refs/heads/dist-snap c: 05543fd h: refs/heads/master i: 31155: d6f2594 v: v3
1 parent aa97ffe commit 30bb35e

File tree

8 files changed

+18
-5
lines changed

8 files changed

+18
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 6e9841666285f0d928f35906a903d4a1e2aa6ffe
10+
refs/heads/dist-snap: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/vec.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,14 +2360,17 @@ mod tests {
23602360
assert capacity(v) == 10u;
23612361
}
23622362

2363+
/*
23632364
#[test]
2365+
#[ignore] // region inference doesn't work well enough for this yet.
23642366
fn test_view() {
23652367
let v = ~[1, 2, 3, 4, 5];
23662368
let v = view(v, 1u, 3u);
23672369
assert(len(v) == 2u);
23682370
assert(v[0] == 2);
23692371
assert(v[1] == 3);
23702372
}
2373+
*/
23712374
}
23722375

23732376
// Local Variables:

branches/dist-snap/src/test/bench/core-std.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ fn main(argv: ~[str]) {
1515
]
1616
];
1717

18-
let tests = vec::view(argv, 1, argv.len());
18+
// FIXME (#2880)
19+
let tests = vec::slice(argv, 1, argv.len());
1920

2021
#bench[shift_push];
2122
#bench[read_line];

branches/dist-snap/src/test/bench/msgsend-pipes-shared.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// different scalability characteristics compared to the select
99
// version.
1010

11+
// xfail-pretty
12+
1113
use std;
1214
import io::writer;
1315
import io::writer_util;

branches/dist-snap/src/test/bench/msgsend-pipes.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//
55
// I *think* it's the same, more or less.
66

7+
// xfail-pretty
8+
79
use std;
810
import io::writer;
911
import io::writer_util;

branches/dist-snap/src/test/bench/shootout-k-nucleotide-pipes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ fn windows_with_carry(bb: ~[const u8], nn: uint,
8181

8282
let len = vec::len(bb);
8383
while ii < len - (nn - 1u) {
84-
it(vec::view(bb, ii, ii+nn));
84+
// FIXME (#2880)
85+
it(vec::slice(bb, ii, ii+nn));
8586
ii += 1u;
8687
}
8788

branches/dist-snap/src/test/bench/shootout-k-nucleotide.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ fn windows_with_carry(bb: ~[const u8], nn: uint,
7979

8080
let len = vec::len(bb);
8181
while ii < len - (nn - 1u) {
82-
it(vec::view(bb, ii, ii+nn));
82+
// FIXME (#2880)
83+
it(vec::slice(bb, ii, ii+nn));
8384
ii += 1u;
8485
}
8586

branches/dist-snap/src/test/bench/task-perf-word-count-generic.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
99
*/
1010

11+
// xfail-pretty
12+
1113
use std;
1214

1315
import option = option;
@@ -307,7 +309,8 @@ fn main(argv: ~[str]) {
307309
}
308310

309311
let readers: ~[fn~() -> word_reader] = if argv.len() >= 2 {
310-
vec::view(argv, 1u, argv.len()).map(
312+
// FIXME (#2880)
313+
vec::slice(argv, 1u, argv.len()).map(
311314
|f| fn~() -> word_reader { file_word_reader(f) } )
312315
}
313316
else {

0 commit comments

Comments
 (0)