diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-09-28 16:26:59 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-09-28 16:27:09 -0700 |
| commit | 1d51cfa1e83ce18d05721683f2e60d9c2a9ae794 (patch) | |
| tree | 043a365444e75fa5f4bda7c59170d762e3821440 /src/libcore | |
| parent | e17d998e9530ee5a9da37f98dab2e33ad6a1d0f9 (diff) | |
Finish de-exporting send_map, future, pipes. Part of #3583.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/core.rc | 3 | ||||
| -rw-r--r-- | src/libcore/pipes.rs | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/libcore/core.rc b/src/libcore/core.rc index 36fb013bcdf..11eaff3dd54 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -234,7 +234,6 @@ mod dlist_iter { #[legacy_exports] mod inst; } -#[legacy_exports] mod send_map; // Concurrency @@ -252,9 +251,7 @@ mod task { #[legacy_exports] mod rt; } -#[legacy_exports] mod future; -#[legacy_exports] mod pipes; // Runtime and language-primitive support diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index 7a4d15ac4fe..bb82afa2945 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -112,7 +112,7 @@ pub struct BufferHeader { // thing along. } -fn BufferHeader() -> BufferHeader{ +pub fn BufferHeader() -> BufferHeader{ BufferHeader { ref_count: 0 } @@ -239,7 +239,6 @@ pub fn entangle_buffer<T: Send, Tstart: Send>( #[abi = "rust-intrinsic"] #[doc(hidden)] extern mod rusti { - #[legacy_exports]; fn atomic_xchg(dst: &mut int, +src: int) -> int; fn atomic_xchg_acq(dst: &mut int, +src: int) -> int; fn atomic_xchg_rel(dst: &mut int, +src: int) -> int; @@ -280,7 +279,6 @@ type rust_task = libc::c_void; #[doc(hidden)] extern mod rustrt { - #[legacy_exports]; #[rust_stack] fn rust_get_task() -> *rust_task; #[rust_stack] @@ -1197,12 +1195,11 @@ pub fn try_send_one<T: Send>(+chan: ChanOne<T>, +data: T) oneshot::client::try_send(move chan, move data).is_some() } -mod rt { - #[legacy_exports]; +pub mod rt { // These are used to hide the option constructors from the // compiler because their names are changing - fn make_some<T>(+val: T) -> Option<T> { Some(move val) } - fn make_none<T>() -> Option<T> { None } + pub fn make_some<T>(+val: T) -> Option<T> { Some(move val) } + pub fn make_none<T>() -> Option<T> { None } } #[cfg(test)] |