diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-04-23 15:16:04 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-04-23 19:19:32 -0700 |
| commit | e944c7dadeed48b199df6891603ae063233ec5a8 (patch) | |
| tree | bb1fe84012278b82d45eb7c6544da42f3be17285 /src/libsyntax | |
| parent | 8708e0c099400f363a5b95806847bd12d780000a (diff) | |
| parent | 2a819ae465c5f375df00ead0b3f4c9009da23f25 (diff) | |
| download | rust-e944c7dadeed48b199df6891603ae063233ec5a8.tar.gz rust-e944c7dadeed48b199df6891603ae063233ec5a8.zip | |
Merge remote-tracking branch 'brson/io'
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
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 61032429c93..801ab0b57dc 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -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 : |