Skip to content

Commit 1d51cfa

Browse files
committed
Finish de-exporting send_map, future, pipes. Part of #3583.
1 parent e17d998 commit 1d51cfa

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/libcore/core.rc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ mod dlist_iter {
234234
#[legacy_exports]
235235
mod inst;
236236
}
237-
#[legacy_exports]
238237
mod send_map;
239238

240239
// Concurrency
@@ -252,9 +251,7 @@ mod task {
252251
#[legacy_exports]
253252
mod rt;
254253
}
255-
#[legacy_exports]
256254
mod future;
257-
#[legacy_exports]
258255
mod pipes;
259256

260257
// Runtime and language-primitive support

src/libcore/pipes.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub struct BufferHeader {
112112
// thing along.
113113
}
114114

115-
fn BufferHeader() -> BufferHeader{
115+
pub fn BufferHeader() -> BufferHeader{
116116
BufferHeader {
117117
ref_count: 0
118118
}
@@ -239,7 +239,6 @@ pub fn entangle_buffer<T: Send, Tstart: Send>(
239239
#[abi = "rust-intrinsic"]
240240
#[doc(hidden)]
241241
extern mod rusti {
242-
#[legacy_exports];
243242
fn atomic_xchg(dst: &mut int, +src: int) -> int;
244243
fn atomic_xchg_acq(dst: &mut int, +src: int) -> int;
245244
fn atomic_xchg_rel(dst: &mut int, +src: int) -> int;
@@ -280,7 +279,6 @@ type rust_task = libc::c_void;
280279

281280
#[doc(hidden)]
282281
extern mod rustrt {
283-
#[legacy_exports];
284282
#[rust_stack]
285283
fn rust_get_task() -> *rust_task;
286284
#[rust_stack]
@@ -1197,12 +1195,11 @@ pub fn try_send_one<T: Send>(+chan: ChanOne<T>, +data: T)
11971195
oneshot::client::try_send(move chan, move data).is_some()
11981196
}
11991197

1200-
mod rt {
1201-
#[legacy_exports];
1198+
pub mod rt {
12021199
// These are used to hide the option constructors from the
12031200
// compiler because their names are changing
1204-
fn make_some<T>(+val: T) -> Option<T> { Some(move val) }
1205-
fn make_none<T>() -> Option<T> { None }
1201+
pub fn make_some<T>(+val: T) -> Option<T> { Some(move val) }
1202+
pub fn make_none<T>() -> Option<T> { None }
12061203
}
12071204

12081205
#[cfg(test)]

0 commit comments

Comments
 (0)