Skip to content

Commit 550f975

Browse files
committed
test: Remove/update some old ignored tests
1 parent 0f52122 commit 550f975

7 files changed

+42
-148
lines changed

src/test/run-pass/borrowck-nested-calls.rs

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

11-
// ignore-test FIXME (#5074) nested method calls
11+
// ignore-test FIXME (#6268) nested method calls
1212

1313
// Test that (safe) nested calls with `&mut` receivers are permitted.
1414

src/test/run-pass/int-conversion-coherence.rs

-25
This file was deleted.

src/test/run-pass/select-macro.rs

-72
This file was deleted.

src/test/run-pass/syntax-extension-shell.rs

-15
This file was deleted.

src/test/run-pass/tag-align-dyn-u64.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,26 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test #7340 fails on 32-bit linux
12-
use std::ptr;
11+
// ignore-linux #7340 fails on 32-bit linux
12+
// ignore-macos #7340 fails on 32-bit macos
1313

14-
enum a_tag<A> {
15-
a_tag(A)
14+
use std::cast;
15+
16+
enum Tag<A> {
17+
Tag(A)
1618
}
1719

18-
struct t_rec {
20+
struct Rec {
1921
c8: u8,
20-
t: a_tag<u64>
22+
t: Tag<u64>
2123
}
2224

23-
fn mk_rec() -> t_rec {
24-
return t_rec { c8:0u8, t:a_tag(0u64) };
25+
fn mk_rec() -> Rec {
26+
return Rec { c8:0u8, t:Tag(0u64) };
2527
}
2628

27-
fn is_8_byte_aligned(u: &a_tag<u64>) -> bool {
28-
let p = ptr::to_unsafe_ptr(u) as uint;
29+
fn is_8_byte_aligned(u: &Tag<u64>) -> bool {
30+
let p: uint = unsafe { cast::transmute(u) };
2931
return (p & 7u) == 0u;
3032
}
3133

src/test/run-pass/tag-align-dyn-variants.rs

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

11-
// ignore-test #7340 fails on 32-bit linux
12-
use std::ptr;
11+
// ignore-linux #7340 fails on 32-bit linux
12+
// ignore-macos #7340 fails on 32-bit macos
1313

14-
enum a_tag<A,B> {
15-
varA(A),
16-
varB(B)
14+
use std::cast;
15+
16+
enum Tag<A,B> {
17+
VarA(A),
18+
VarB(B),
1719
}
1820

19-
struct t_rec<A,B> {
21+
struct Rec<A,B> {
2022
chA: u8,
21-
tA: a_tag<A,B>,
23+
tA: Tag<A,B>,
2224
chB: u8,
23-
tB: a_tag<A,B>
25+
tB: Tag<A,B>,
2426
}
2527

26-
fn mk_rec<A,B>(a: A, b: B) -> t_rec<A,B> {
27-
return t_rec{ chA:0u8, tA:varA(a), chB:1u8, tB:varB(b) };
28+
fn mk_rec<A,B>(a: A, b: B) -> Rec<A,B> {
29+
Rec { chA:0u8, tA:VarA(a), chB:1u8, tB:VarB(b) }
2830
}
2931

3032
fn is_aligned<A>(amnt: uint, u: &A) -> bool {
31-
let p = ptr::to_unsafe_ptr(u) as uint;
33+
let p: uint = unsafe { cast::transmute(u) };
3234
return (p & (amnt-1u)) == 0u;
3335
}
3436

35-
fn variant_data_is_aligned<A,B>(amnt: uint, u: &a_tag<A,B>) -> bool {
37+
fn variant_data_is_aligned<A,B>(amnt: uint, u: &Tag<A,B>) -> bool {
3638
match u {
37-
&varA(ref a) => is_aligned(amnt, a),
38-
&varB(ref b) => is_aligned(amnt, b)
39+
&VarA(ref a) => is_aligned(amnt, a),
40+
&VarB(ref b) => is_aligned(amnt, b)
3941
}
4042
}
4143

src/test/run-pass/tag-align-u64.rs

+13-11
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,27 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test #7340 fails on 32-bit linux
12-
use std::ptr;
11+
// ignore-linux #7340 fails on 32-bit linux
12+
// ignore-macos #7340 fails on 32-bit macos
1313

14-
enum a_tag {
15-
a_tag(u64)
14+
use std::cast;
15+
16+
enum Tag {
17+
Tag(u64)
1618
}
1719

18-
struct t_rec {
20+
struct Rec {
1921
c8: u8,
20-
t: a_tag
22+
t: Tag
2123
}
2224

23-
fn mk_rec() -> t_rec {
24-
return t_rec { c8:0u8, t:a_tag(0u64) };
25+
fn mk_rec() -> Rec {
26+
return Rec { c8:0u8, t:Tag(0u64) };
2527
}
2628

27-
fn is_8_byte_aligned(u: &a_tag) -> bool {
28-
let p = ptr::to_unsafe_ptr(u) as u64;
29-
return (p & 7u64) == 0u64;
29+
fn is_8_byte_aligned(u: &Tag) -> bool {
30+
let p: uint = unsafe { cast::transmute(u) };
31+
return (p & 7u) == 0u;
3032
}
3133

3234
pub fn main() {

0 commit comments

Comments
 (0)