diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs b/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs index 6eb8090af95fa..fa8cd005c0456 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs @@ -11,6 +11,8 @@ // xfail-test // error-pattern:index out of bounds +use std::uint; + fn main() { let x = ~[1u,2u,3u]; diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs index 8aec9782bf75d..2a5b454357659 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs @@ -11,6 +11,8 @@ // xfail-test // error-pattern:index out of bounds +use std::u64; + #[cfg(target_arch="x86")] fn main() { let x = ~[1u,2u,3u]; diff --git a/src/test/run-fail/too-much-recursion-unwinding.rs b/src/test/run-fail/too-much-recursion-unwinding.rs index 16d0fe346687c..04dea449172da 100644 --- a/src/test/run-fail/too-much-recursion-unwinding.rs +++ b/src/test/run-fail/too-much-recursion-unwinding.rs @@ -15,7 +15,7 @@ // during unwinding fn recurse() { - log(debug, "don't optimize me out"); + info!("don't optimize me out"); recurse(); } @@ -35,9 +35,7 @@ impl Drop for r { } fn r(recursed: *mut bool) -> r { - unsafe { - r { recursed: recursed } - } + r { recursed: recursed } } fn main() { diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs index 75af701cedeae..bfcd2e8f8db82 100644 --- a/src/test/run-fail/unwind-misc-1.rs +++ b/src/test/run-fail/unwind-misc-1.rs @@ -8,17 +8,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// xfail-test - issue #5512, fails but exits with 0 - +// exec-env:RUST_NEWRT=1 // error-pattern:fail fn main() { let count = @mut 0u; let mut map = std::hashmap::HashMap::new(); let mut arr = ~[]; - for uint::range(0u, 10u) |i| { - arr += ~[@~"key stuff"]; - map.insert(arr.clone(), arr + ~[@~"value stuff"]); + for std::uint::range(0u, 10u) |i| { + arr.push(@~"key stuff"); + map.insert(arr.clone(), arr + &[@~"value stuff"]); if arr.len() == 5 { fail!(); }