Skip to content

Commit fa010a6

Browse files
committed
De-export std::{uv, uv_ll, uv_iotask, uv_global_loop}. Part of #3583.
1 parent 13979eb commit fa010a6

File tree

5 files changed

+139
-167
lines changed

5 files changed

+139
-167
lines changed

src/libstd/std.rc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,9 @@ mod net_tcp;
5555
mod net_url;
5656

5757
// libuv modules
58-
#[legacy_exports]
5958
mod uv;
60-
#[legacy_exports]
6159
mod uv_ll;
62-
#[legacy_exports]
6360
mod uv_iotask;
64-
#[legacy_exports]
6561
mod uv_global_loop;
6662

6763

src/libstd/uv.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
* facilities.
2424
*/
2525

26-
use ll = uv_ll;
27-
export ll;
28-
29-
use iotask = uv_iotask;
30-
export iotask;
31-
32-
use global_loop = uv_global_loop;
33-
export global_loop;
26+
pub use ll = uv_ll;
27+
pub use iotask = uv_iotask;
28+
pub use global_loop = uv_global_loop;

src/libstd/uv_global_loop.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
33
#[forbid(deprecated_mode)];
44

5-
export get;
6-
75
use ll = uv_ll;
86
use iotask = uv_iotask;
97
use get_gl = get;
@@ -15,7 +13,6 @@ use task::TaskBuilder;
1513
use either::{Left, Right};
1614

1715
extern mod rustrt {
18-
#[legacy_exports];
1916
fn rust_uv_get_kernel_global_chan_ptr() -> *libc::uintptr_t;
2017
}
2118

@@ -31,7 +28,7 @@ extern mod rustrt {
3128
* * A `hl::high_level_loop` that encapsulates communication with the global
3229
* loop.
3330
*/
34-
fn get() -> IoTask {
31+
pub fn get() -> IoTask {
3532
return get_monitor_task_gl();
3633
}
3734

@@ -112,7 +109,6 @@ fn spawn_loop() -> IoTask {
112109

113110
#[cfg(test)]
114111
mod test {
115-
#[legacy_exports];
116112
extern fn simple_timer_close_cb(timer_ptr: *ll::uv_timer_t) unsafe {
117113
let exit_ch_ptr = ll::get_data_for_uv_handle(
118114
timer_ptr as *libc::c_void) as *comm::Chan<bool>;

src/libstd/uv_iotask.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
#[forbid(deprecated_mode)];
99

10-
export IoTask;
11-
export spawn_iotask;
12-
export interact;
13-
export exit;
14-
1510
use libc::c_void;
1611
use ptr::p2::addr_of;
1712
use comm = core::comm;
@@ -20,14 +15,14 @@ use task::TaskBuilder;
2015
use ll = uv_ll;
2116

2217
/// Used to abstract-away direct interaction with a libuv loop.
23-
enum IoTask {
18+
pub enum IoTask {
2419
IoTask_({
2520
async_handle: *ll::uv_async_t,
2621
op_chan: Chan<IoTaskMsg>
2722
})
2823
}
2924

30-
fn spawn_iotask(+task: task::TaskBuilder) -> IoTask {
25+
pub fn spawn_iotask(+task: task::TaskBuilder) -> IoTask {
3126

3227
do listen |iotask_ch| {
3328

@@ -64,7 +59,7 @@ fn spawn_iotask(+task: task::TaskBuilder) -> IoTask {
6459
* module. It is not safe to send the `loop_ptr` param to this callback out
6560
* via ports/chans.
6661
*/
67-
unsafe fn interact(iotask: IoTask,
62+
pub unsafe fn interact(iotask: IoTask,
6863
+cb: fn~(*c_void)) {
6964
send_msg(iotask, Interaction(move cb));
7065
}
@@ -76,7 +71,7 @@ unsafe fn interact(iotask: IoTask,
7671
* async handle and do a sanity check to make sure that all other handles are
7772
* closed, causing a failure otherwise.
7873
*/
79-
fn exit(iotask: IoTask) unsafe {
74+
pub fn exit(iotask: IoTask) unsafe {
8075
send_msg(iotask, TeardownLoop);
8176
}
8277

@@ -170,7 +165,6 @@ extern fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
170165

171166
#[cfg(test)]
172167
mod test {
173-
#[legacy_exports];
174168
extern fn async_close_cb(handle: *ll::uv_async_t) unsafe {
175169
log(debug, fmt!("async_close_cb handle %?", handle));
176170
let exit_ch = (*(ll::get_data_for_uv_handle(handle)

0 commit comments

Comments
 (0)