about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorjmgrosen <jmgrosen@gmail.com>2013-09-03 16:11:00 -0700
committerjmgrosen <jmgrosen@gmail.com>2013-09-03 16:11:00 -0700
commit4a18d46130e13aad28fc072dafdd7e7b4baa8736 (patch)
tree55bf5d196fff7b938cfb7aa16374a897f8a3b653 /src/libstd
parentfc9fa2cb6ca2b0979137134713fe3f693090a9d9 (diff)
downloadrust-4a18d46130e13aad28fc072dafdd7e7b4baa8736.tar.gz
rust-4a18d46130e13aad28fc072dafdd7e7b4baa8736.zip
Fixes #8881. condition! imports parent's pub identifiers
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/c_str.rs2
-rw-r--r--src/libstd/rt/io/mod.rs4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs
index 70b04e37ee1..8e7129578ee 100644
--- a/src/libstd/c_str.rs
+++ b/src/libstd/c_str.rs
@@ -29,6 +29,8 @@ pub enum NullByteResolution {
 
 condition! {
     // this should be &[u8] but there's a lifetime issue
+    // NOTE: this super::NullByteResolution should be NullByteResolution
+    // Change this next time the snapshot it updated.
     null_byte: (~[u8]) -> super::NullByteResolution;
 }
 
diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs
index 116d240308a..a2002c989f0 100644
--- a/src/libstd/rt/io/mod.rs
+++ b/src/libstd/rt/io/mod.rs
@@ -385,6 +385,8 @@ impl ToStr for IoErrorKind {
 // 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 -> ();
 }
 
@@ -392,6 +394,8 @@ condition! {
 // 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 -> ();
 }