Step one for 'proper' pub condition: support pub keyword in form.

rust-lang · May 6, 2013 · 1cbf0a8 · 1cbf0a8 · bors · May 7, 2013
1 parent 6e6a4be
commit 1cbf0a8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/libcore/rt/io/mod.rs b/src/libcore/rt/io/mod.rs
@@ -337,7 +337,8 @@ pub enum IoErrorKind {
 // XXX: Can't put doc comments on macros
 // Raised by `I/O` operations on error.
 condition! {
-    io_error: super::IoError -> ();
+    // FIXME (#6009): uncomment `pub` after expansion support lands.
+    /*pub*/ io_error: super::IoError -> ();
 }
 
 pub trait Reader {

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
@@ -485,8 +485,23 @@ pub fn core_macros() -> ~str {
 
     macro_rules! condition (
 
+        { pub $c:ident: $in:ty -> $out:ty; } => {
+
+            pub mod $c {
+                fn key(_x: @::core::condition::Handler<$in,$out>) { }
+
+                pub static cond :
+                    ::core::condition::Condition<'static,$in,$out> =
+                    ::core::condition::Condition {
+                        name: stringify!($c),
+                        key: key
+                    };
+            }
+        };
+
         { $c:ident: $in:ty -> $out:ty; } => {
 
+            // FIXME (#6009): remove mod's `pub` below once variant above lands.
             pub mod $c {
                 fn key(_x: @::core::condition::Handler<$in,$out>) { }