bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make moves explicit in aux test files

Browse source
This commit is contained in:
Tim Chevalier 2012-09-18 22:44:15 -07:00
parent d52f988dbb
commit e18c6bb3b6
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/auxiliary/cci_class_6.rs
View file

@ -21,7 +21,7 @@ fn cat<U>(in_x : uint, in_y : int, -in_info: ~[U]) -> cat<U> {
cat { cat {
meows: in_x, meows: in_x,
how_hungry: in_y, how_hungry: in_y,
info: in_info info: move in_info
} }
} }

7
src/test/auxiliary/test_comm.rs
View file

@ -7,7 +7,6 @@
use libc::size_t; use libc::size_t;
export port::{};
export port; export port;
export recv; export recv;
@ -65,13 +64,13 @@ fn recv<T: Send>(p: port<T>) -> T { recv_((**p).po) }
/// Receive on a raw port pointer /// Receive on a raw port pointer
fn recv_<T: Send>(p: *rust_port) -> T { fn recv_<T: Send>(p: *rust_port) -> T {
let yield = 0u; let yield = 0;
let yieldp = ptr::addr_of(&yield); let yieldp = ptr::addr_of(&yield);
let mut res; let mut res;
res = rusti::init::<T>(); res = rusti::init::<T>();
rustrt::port_recv(ptr::addr_of(&res) as *uint, p, yieldp); rustrt::port_recv(ptr::addr_of(&res) as *uint, p, yieldp);
if yield != 0u { if yield != 0 {
// Data isn't available yet, so res has not been initialized. // Data isn't available yet, so res has not been initialized.
task::yield(); task::yield();
} else { } else {
@ -79,7 +78,7 @@ fn recv_<T: Send>(p: *rust_port) -> T {
// this is a good place to yield // this is a good place to yield
task::yield(); task::yield();
} }
return res; move res
} }