diff options
| author | bors <bors@rust-lang.org> | 2013-09-04 16:20:46 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-04 16:20:46 -0700 |
| commit | b161e09e03a5a0135557daa7166d290a515fbec2 (patch) | |
| tree | 5389bbee679d726c69023e9fae74d1a0fb3ee215 /src/libstd/rt | |
| parent | 6c13b0f4f6b6c51c0d83bad3c48d7249a1d15308 (diff) | |
| parent | c326ff0c2839862e8307fcbfec84afd288168051 (diff) | |
| download | rust-b161e09e03a5a0135557daa7166d290a515fbec2.tar.gz rust-b161e09e03a5a0135557daa7166d290a515fbec2.zip | |
auto merge of #8977 : pnkfelix/rust/fsk-followup-on-6009-rebased, r=alexcrichton
Fix #6009. Rebased version of #8970. Inherits review from alexcrichton.
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/io/mod.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs index 75af7ff8444..3b979cc2266 100644 --- a/src/libstd/rt/io/mod.rs +++ b/src/libstd/rt/io/mod.rs @@ -384,19 +384,17 @@ impl ToStr for IoErrorKind { // XXX: Can't put doc comments on macros // Raised by `I/O` operations on error. condition! { - // FIXME (#6009): uncomment `pub` after expansion support lands. // NOTE: this super::IoError should be IoError - // Change this next time the snapshot it updated. - /*pub*/ io_error: super::IoError -> (); + // Change this next time the snapshot is updated. + pub io_error: super::IoError -> (); } // XXX: Can't put doc comments on macros // Raised by `read` on error condition! { - // FIXME (#6009): uncomment `pub` after expansion support lands. // NOTE: this super::IoError should be IoError // Change this next time the snapshot it updated. - /*pub*/ read_error: super::IoError -> (); + pub read_error: super::IoError -> (); } pub trait Reader { |