Skip to content

Commit 3ee4238

Browse files
committed
auto merge of #7992 : huonw/rust/un-xfail, r=z0w0
...(they still don't work).
2 parents b5799e1 + de2b5c5 commit 3ee4238

4 files changed

+10
-9
lines changed

src/test/run-fail/bug-2470-bounds-check-overflow-2.rs

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// xfail-test
1212
// error-pattern:index out of bounds
1313

14+
use std::uint;
15+
1416
fn main() {
1517
let x = ~[1u,2u,3u];
1618

src/test/run-fail/bug-2470-bounds-check-overflow-3.rs

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// xfail-test
1212
// error-pattern:index out of bounds
1313

14+
use std::u64;
15+
1416
#[cfg(target_arch="x86")]
1517
fn main() {
1618
let x = ~[1u,2u,3u];

src/test/run-fail/too-much-recursion-unwinding.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// during unwinding
1616

1717
fn recurse() {
18-
log(debug, "don't optimize me out");
18+
info!("don't optimize me out");
1919
recurse();
2020
}
2121

@@ -35,9 +35,7 @@ impl Drop for r {
3535
}
3636

3737
fn r(recursed: *mut bool) -> r {
38-
unsafe {
39-
r { recursed: recursed }
40-
}
38+
r { recursed: recursed }
4139
}
4240

4341
fn main() {

src/test/run-fail/unwind-misc-1.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test - issue #5512, fails but exits with 0
12-
11+
// exec-env:RUST_NEWRT=1
1312
// error-pattern:fail
1413

1514
fn main() {
1615
let count = @mut 0u;
1716
let mut map = std::hashmap::HashMap::new();
1817
let mut arr = ~[];
19-
for uint::range(0u, 10u) |i| {
20-
arr += ~[@~"key stuff"];
21-
map.insert(arr.clone(), arr + ~[@~"value stuff"]);
18+
for std::uint::range(0u, 10u) |i| {
19+
arr.push(@~"key stuff");
20+
map.insert(arr.clone(), arr + &[@~"value stuff"]);
2221
if arr.len() == 5 {
2322
fail!();
2423
}

0 commit comments

Comments
 (0)