Skip to content

Commit fe13b86

Browse files
committed
Make conditions public. rust-lang#6009
1 parent 6644a03 commit fe13b86

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

src/libcore/condition.rs

+21
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,25 @@ mod test {
192192

193193
assert!(trapped);
194194
}
195+
196+
// Issue #6009
197+
mod m {
198+
condition! {
199+
sadness: int -> int;
200+
}
201+
202+
mod n {
203+
use super::sadness;
204+
205+
#[test]
206+
fn test_conditions_are_public() {
207+
let mut trapped = false;
208+
do sadness::cond.trap(|_| {
209+
0
210+
}).in {
211+
sadness::cond.raise(0);
212+
}
213+
}
214+
}
215+
}
195216
}

src/libsyntax/ext/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ pub fn core_macros() -> ~str {
475475

476476
{ $c:ident: $in:ty -> $out:ty; } => {
477477

478-
mod $c {
478+
pub mod $c {
479479
fn key(_x: @::core::condition::Handler<$in,$out>) { }
480480

481481
pub static cond :

0 commit comments

Comments
 (0)