user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'brson/io'

Browse source 
This also reverts some changes to TLS that were leaking memory.

Conflicts:
	src/libcore/rt/uv/net.rs
	src/libcore/task/local_data_priv.rs
	src/libcore/unstable/lang.rs
This commit is contained in:
Brian Anderson 2013-04-23 15:16:04 -07:00
commit e944c7dade
42 changed files with 1206 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ext/expand.rs
View file

@ -475,7 +475,7 @@ pub fn core_macros() -> ~str {
{ $c:ident: $in:ty -> $out:ty; } => {
mod $c {
pub mod $c {
fn key(_x: @::core::condition::Handler<$in,$out>) { }
pub static cond :