bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'rust-lang/master'

Browse source 
Conflicts:
	src/libcore/cell.rs
	src/librustc_driver/test.rs
	src/libstd/old_io/net/tcp.rs
	src/libstd/old_io/process.rs
This commit is contained in:
Brian Anderson 2015-01-27 09:38:30 -08:00
commit 7122305053
219 changed files with 1892 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/thread.rs
View file

@ -158,7 +158,7 @@ use sync::{Mutex, Condvar, Arc};
use str::Str;
use string::String;
use rt::{self, unwind};
use io::{Writer, stdio};
use old_io::{Writer, stdio};
use thunk::Thunk;
use sys::thread as imp;
@ -516,7 +516,7 @@ mod test {
use sync::mpsc::{channel, Sender};
use boxed::BoxAny;
use result;
use std::io::{ChanReader, ChanWriter};
use std::old_io::{ChanReader, ChanWriter};
use super::{Thread, Builder};
use thunk::Thunk;