Skip to content

Commit b838656

Browse files
committed
---
yaml --- r: 37215 b: refs/heads/try c: e18c6bb h: refs/heads/master i: 37213: 49ff593 37211: 8b15ed8 37207: 79846dc 37199: e4ea5d1 37183: 3a321f8 v: v3
1 parent 1fac8df commit b838656

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: d52f988dbb8c147d310926434b7ed2415a4a8719
5+
refs/heads/try: e18c6bb3b6f9daab455227dae384d9a3b961aa1c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/auxiliary/cci_class_6.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn cat<U>(in_x : uint, in_y : int, -in_info: ~[U]) -> cat<U> {
2121
cat {
2222
meows: in_x,
2323
how_hungry: in_y,
24-
info: in_info
24+
info: move in_info
2525
}
2626
}
2727

branches/try/src/test/auxiliary/test_comm.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use libc::size_t;
99

10-
export port::{};
1110
export port;
1211
export recv;
1312

@@ -65,21 +64,21 @@ fn recv<T: Send>(p: port<T>) -> T { recv_((**p).po) }
6564

6665
/// Receive on a raw port pointer
6766
fn recv_<T: Send>(p: *rust_port) -> T {
68-
let yield = 0u;
67+
let yield = 0;
6968
let yieldp = ptr::addr_of(&yield);
7069
let mut res;
7170
res = rusti::init::<T>();
7271
rustrt::port_recv(ptr::addr_of(&res) as *uint, p, yieldp);
7372

74-
if yield != 0u {
73+
if yield != 0 {
7574
// Data isn't available yet, so res has not been initialized.
7675
task::yield();
7776
} else {
7877
// In the absense of compiler-generated preemption points
7978
// this is a good place to yield
8079
task::yield();
8180
}
82-
return res;
81+
move res
8382
}
8483

8584

0 commit comments

Comments
 (0)