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

Merge remote-tracking branch 'brson/io' into incoming

Browse source 
Conflicts:
	mk/rt.mk
	src/libcore/run.rs
This commit is contained in:
Brian Anderson 2013-05-02 20:51:56 -07:00
commit 6c478c7de8
42 changed files with 1399 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,7 +487,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 :