bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #22435: aturon/final-stab-thread

Browse source 
Conflicts:
	src/test/bench/rt-messaging-ping-pong.rs
	src/test/bench/rt-parfib.rs
	src/test/bench/task-perf-spawnalot.rs
This commit is contained in:
Alex Crichton 2015-02-17 15:19:18 -08:00
commit d8450d69bb
91 changed files with 856 additions and 676 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/process.rs
View file

@ -27,7 +27,7 @@ use sys::process2::Process as ProcessImp;
use sys::process2::Command as CommandImp;
use sys::process2::ExitStatus as ExitStatusImp;
use sys_common::{AsInner, AsInnerMut};
use thread::Thread;
use thread;
/// Representation of a running or exited child process.
///
@ -462,7 +462,7 @@ impl Child {
let (tx, rx) = channel();
match stream {
Some(stream) => {
Thread::spawn(move || {
thread::spawn(move || {
let mut stream = stream;
let mut ret = Vec::new();
let res = stream.read_to_end(&mut ret);
@ -499,7 +499,7 @@ mod tests {
use str;
use super::{Child, Command, Output, ExitStatus, Stdio};
use sync::mpsc::channel;
use thread::Thread;
use thread;
use time::Duration;
// FIXME(#10380) these tests should not all be ignored on android.