Skip to content

Commit

Permalink
Finish de-exporting send_map, future, pipes. Part of #3583.
Browse files Browse the repository at this point in the history
  • Loading branch information
graydon committed Sep 28, 2012
1 parent e17d998 commit 1d51cfa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
3 changes: 0 additions & 3 deletions src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ mod dlist_iter {
#[legacy_exports]
mod inst;
}
#[legacy_exports]
mod send_map;

// Concurrency
Expand All @@ -252,9 +251,7 @@ mod task {
#[legacy_exports]
mod rt;
}
#[legacy_exports]
mod future;
#[legacy_exports]
mod pipes;

// Runtime and language-primitive support
Expand Down
11 changes: 4 additions & 7 deletions src/libcore/pipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub struct BufferHeader {
// thing along.
}

fn BufferHeader() -> BufferHeader{
pub fn BufferHeader() -> BufferHeader{
BufferHeader {
ref_count: 0
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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)]
Expand Down

0 comments on commit 1d51cfa

Please sign in to comment.