rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fallout from stabilization

Browse Source
This commit is contained in:
Aaron Turon
2015-02-17 15:10:25 -08:00
parent d8f8f7a58c
commit d0de2b46e9
89 changed files with 578 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/old_io/process.rs
View File

@@ -30,7 +30,7 @@ use sync::mpsc::{channel, Receiver};
use sys::fs::FileDesc;
use sys::process::Process as ProcessImp;
use sys;
use thread::Thread;
use thread;
#[cfg(windows)] use hash;
#[cfg(windows)] use str;
@@ -703,7 +703,7 @@ impl Process {
let (tx, rx) = channel();
match stream {
Some(stream) => {
Thread::spawn(move || {
thread::spawn(move || {
let mut stream = stream;
tx.send(stream.read_to_end()).unwrap();
});
@@ -764,7 +764,7 @@ mod tests {
use super::{CreatePipe};
use super::{InheritFd, Process, PleaseExitSignal, Command, ProcessOutput};
use sync::mpsc::channel;
use thread::Thread;
use thread;
use time::Duration;
// FIXME(#10380) these tests should not all be ignored on android.
@@ -1169,14 +1169,14 @@ mod tests {
fn wait_timeout2() {
let (tx, rx) = channel();
let tx2 = tx.clone();
let _t = Thread::spawn(move|| {
let _t = thread::spawn(move|| {
let mut p = sleeper();
p.set_timeout(Some(10));
assert_eq!(p.wait().err().unwrap().kind, TimedOut);
p.signal_kill().unwrap();
tx.send(()).unwrap();
});
let _t = Thread::spawn(move|| {
let _t = thread::spawn(move|| {
let mut p = sleeper();
p.set_timeout(Some(10));
assert_eq!(p.wait().err().unwrap().kind, TimedOut);