Skip to content

Commit 2b08405

Browse files
committed
---
yaml --- r: 14076 b: refs/heads/try c: 34aa956 h: refs/heads/master v: v3
1 parent 3628b44 commit 2b08405

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 67b1034989709910bec0a97a2994640e45515255
5+
refs/heads/try: 34aa956e68e037c9ca0a1d3adf35de7b31fdd4de
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/test/run-pass/binops.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,19 @@ fn test_chan() {
8181
assert (ch1 == ch2);
8282
}
8383

84-
fn test_ptr() {
85-
// FIXME: Don't know what binops apply to pointers. Don't know how
86-
// to make or use pointers
84+
fn test_ptr() unsafe {
85+
let p1: *u8 = unsafe::reinterpret_cast(0);
86+
let p2: *u8 = unsafe::reinterpret_cast(0);
87+
let p3: *u8 = unsafe::reinterpret_cast(1);
88+
89+
assert p1 == p2;
90+
assert p1 != p3;
91+
assert p1 < p3;
92+
assert p1 <= p3;
93+
assert p3 > p1;
94+
assert p3 >= p3;
95+
assert p1 <= p2;
96+
assert p1 >= p2;
8797
}
8898

8999
fn test_task() {
@@ -121,13 +131,12 @@ fn test_fn() {
121131
#[nolink]
122132
native mod test {
123133
fn unsupervise();
134+
fn get_task_id();
124135
}
125136

126-
// FIXME (#1058): comparison of native fns
127137
fn test_native_fn() {
128-
/*
129-
assert (native_mod::last_os_error != native_mod::unsupervise);
130-
*/
138+
assert test::unsupervise != test::get_task_id;
139+
assert test::unsupervise == test::unsupervise;
131140
}
132141

133142
fn main() {

branches/try/src/test/run-pass/bitwise.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ fn target() {
77

88
#[cfg(target_arch = "x86_64")]
99
fn target() {
10-
// FIXME (974) Can't lex this as a single integer
11-
assert (-1000 >> 3 == 23058430 * 1000000000 * 100
12-
+ 92 * 100000000 + 13693827);
10+
assert (-1000 >> 3 == 2305843009213693827);
1311
}
1412

1513
fn general() {

branches/try/src/test/run-pass/init-res-into-things.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ fn test_box_rec() {
6262
fn main() {
6363
test_box();
6464
test_rec();
65-
// FIXME: enum constructors don't optimize their arguments into moves
66-
// test_tag();
65+
test_tag();
6766
test_tup();
6867
test_unique();
6968
test_box_rec();

branches/try/src/test/run-pass/task-comm-16.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,15 @@ fn test_vec() {
3434
}
3535

3636
fn test_str() {
37-
// FIXME: re-enable this once strings are unique and sendable
38-
/*
39-
let po = comm::mk_port();
40-
let ch = po.mk_chan();
41-
let s0: str = "test";
42-
send(ch, s0);
43-
let s1: str;
44-
s1 = po.recv();
45-
assert (s1.(0) as u8 == 't' as u8);
46-
assert (s1.(1) as u8 == 'e' as u8);
47-
assert (s1.(2) as u8 == 's' as u8);
48-
assert (s1.(3) as u8 == 't' as u8);
49-
*/
37+
let po = port();
38+
let ch = chan(po);
39+
let s0 = "test";
40+
send(ch, s0);
41+
let s1 = recv(po);
42+
assert (s1[0] == 't' as u8);
43+
assert (s1[1] == 'e' as u8);
44+
assert (s1[2] == 's' as u8);
45+
assert (s1[3] == 't' as u8);
5046
}
5147

5248
fn test_tag() {

0 commit comments

Comments
 (0)