diff options
| author | bors <bors@rust-lang.org> | 2013-03-01 01:54:38 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-01 01:54:38 -0800 |
| commit | 1d34a55d880baa3d186e72d345c1d3ce99d88d2c (patch) | |
| tree | f37e102fb10562118c523964833f2306a7f47463 | |
| parent | a660bb362ce5a39014fb274367e6361d4deb8a7d (diff) | |
| parent | 4a04a188e3cf86cdef0e499dc65810009de27808 (diff) | |
auto merge of #5162 : brson/rust/fixmes, r=brson
| -rw-r--r-- | src/libcore/comm.rs | 4 | ||||
| -rw-r--r-- | src/rt/rust_upcall.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs index b0825816626..238207f12b6 100644 --- a/src/libcore/comm.rs +++ b/src/libcore/comm.rs @@ -17,8 +17,8 @@ use vec; use pipes::{recv, try_recv, wait_many, peek, PacketHeader}; -// NOTE Making this public exposes some plumbing from pipes. Needs -// some refactoring +// FIXME #5160: Making this public exposes some plumbing from +// pipes. Needs some refactoring pub use pipes::Selectable; /// A trait for things that can send multiple messages. diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index b0e13717b82..9f39e1433fc 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -120,7 +120,7 @@ upcall_fail(char const *expr, size_t line) { rust_task *task = rust_try_get_current_task(); if (task == NULL) { - // NOTE: Need to think about what to do here + // FIXME #5161: Need to think about what to do here printf("failure outside of a task"); abort(); } |
