diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2013-09-04 04:39:14 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2013-09-04 10:03:47 +0200 |
| commit | 83e19d2eada77ded543cd6edf5a4b6351a79a0f9 (patch) | |
| tree | 23f7dbc7f393825912a3aed73724f3f37f84a9de /src/libstd | |
| parent | 64ff31558480f2bf0dea71a0c3e2880387edb826 (diff) | |
| download | rust-83e19d2eada77ded543cd6edf5a4b6351a79a0f9.tar.gz rust-83e19d2eada77ded543cd6edf5a4b6351a79a0f9.zip | |
Added explicit pub to several conditions. Enables completion of #6009.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/c_str.rs | 6 | ||||
| -rw-r--r-- | src/libstd/rt/io/mod.rs | 8 | ||||
| -rw-r--r-- | src/libstd/str.rs | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 8e7129578ee..6f12e219c3c 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -28,10 +28,10 @@ pub enum NullByteResolution { } condition! { - // this should be &[u8] but there's a lifetime issue + // This should be &[u8] but there's a lifetime issue (#5370). // NOTE: this super::NullByteResolution should be NullByteResolution - // Change this next time the snapshot it updated. - null_byte: (~[u8]) -> super::NullByteResolution; + // Change this next time the snapshot is updated. + pub null_byte: (~[u8]) -> super::NullByteResolution; } /// The representation of a C String. 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 { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index e4d1b324e73..471ac409cbb 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -42,7 +42,7 @@ Section: Conditions */ condition! { - not_utf8: (~str) -> ~str; + pub not_utf8: (~str) -> ~str; } /* |