diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-04-16 23:45:29 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-04-18 14:07:35 -0700 |
| commit | decd3901d5d63013a98ecc481c441f3f793b5207 (patch) | |
| tree | 37327a47db463003bcb8c5342fcecb04d56d1c64 /src/libstd | |
| parent | bc60d84507ba4d492889c9b702318346b5784e5c (diff) | |
| download | rust-decd3901d5d63013a98ecc481c441f3f793b5207.tar.gz rust-decd3901d5d63013a98ecc481c441f3f793b5207.zip | |
core::comm: Modernize constructors to use `new`
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/arc.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net_ip.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net_tcp.rs | 30 | ||||
| -rw-r--r-- | src/libstd/test.rs | 10 | ||||
| -rw-r--r-- | src/libstd/timer.rs | 4 | ||||
| -rw-r--r-- | src/libstd/uv_global_loop.rs | 2 | ||||
| -rw-r--r-- | src/libstd/uv_iotask.rs | 6 | ||||
| -rw-r--r-- | src/libstd/uv_ll.rs | 6 |
8 files changed, 31 insertions, 31 deletions
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs index da1e4688939..8abe0262314 100644 --- a/src/libstd/arc.rs +++ b/src/libstd/arc.rs @@ -499,7 +499,7 @@ mod tests { let (p, c) = comm::stream(); do task::spawn() || { - let p = comm::PortSet(); + let p = comm::PortSet::new(); c.send(p.chan()); let arc_v = p.recv(); diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs index e920ff20ac5..e58b17b8321 100644 --- a/src/libstd/net_ip.rs +++ b/src/libstd/net_ip.rs @@ -113,7 +113,7 @@ enum IpGetAddrErr { pub fn get_addr(node: &str, iotask: &iotask) -> result::Result<~[IpAddr], IpGetAddrErr> { let (output_po, output_ch) = stream(); - let mut output_ch = Some(SharedChan(output_ch)); + let mut output_ch = Some(SharedChan::new(output_ch)); do str::as_buf(node) |node_ptr, len| { let output_ch = output_ch.swap_unwrap(); debug!("slice len %?", len); diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index b32df75063d..6bf97843fa1 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -150,16 +150,16 @@ pub fn connect(input_ip: ip::IpAddr, port: uint, -> result::Result<TcpSocket, TcpConnectErrData> { unsafe { let (result_po, result_ch) = stream::<ConnAttempt>(); - let result_ch = SharedChan(result_ch); + let result_ch = SharedChan::new(result_ch); let (closed_signal_po, closed_signal_ch) = stream::<()>(); - let closed_signal_ch = SharedChan(closed_signal_ch); + let closed_signal_ch = SharedChan::new(closed_signal_ch); let conn_data = ConnectReqData { result_ch: result_ch, closed_signal_ch: closed_signal_ch }; let conn_data_ptr = ptr::addr_of(&conn_data); let (reader_po, reader_ch) = stream::<Result<~[u8], TcpErrData>>(); - let reader_ch = SharedChan(reader_ch); + let reader_ch = SharedChan::new(reader_ch); let stream_handle_ptr = malloc_uv_tcp_t(); *(stream_handle_ptr as *mut uv::ll::uv_tcp_t) = uv::ll::tcp_t(); let socket_data = @TcpSocketData { @@ -517,7 +517,7 @@ pub fn accept(new_conn: TcpNewConnection) server_handle_ptr) as *TcpListenFcData; let (reader_po, reader_ch) = stream::< Result<~[u8], TcpErrData>>(); - let reader_ch = SharedChan(reader_ch); + let reader_ch = SharedChan::new(reader_ch); let iotask = &(*server_data_ptr).iotask; let stream_handle_ptr = malloc_uv_tcp_t(); *(stream_handle_ptr as *mut uv::ll::uv_tcp_t) = @@ -537,7 +537,7 @@ pub fn accept(new_conn: TcpNewConnection) (*client_socket_data_ptr).stream_handle_ptr; let (result_po, result_ch) = stream::<Option<TcpErrData>>(); - let result_ch = SharedChan(result_ch); + let result_ch = SharedChan::new(result_ch); // UNSAFE LIBUV INTERACTION BEGIN // .. normally this happens within the context of @@ -646,9 +646,9 @@ fn listen_common(host_ip: ip::IpAddr, on_connect_cb: ~fn(*uv::ll::uv_tcp_t)) -> result::Result<(), TcpListenErrData> { let (stream_closed_po, stream_closed_ch) = stream::<()>(); - let stream_closed_ch = SharedChan(stream_closed_ch); + let stream_closed_ch = SharedChan::new(stream_closed_ch); let (kill_po, kill_ch) = stream::<Option<TcpErrData>>(); - let kill_ch = SharedChan(kill_ch); + let kill_ch = SharedChan::new(kill_ch); let server_stream = uv::ll::tcp_t(); let server_stream_ptr = ptr::addr_of(&server_stream); let server_data: TcpListenFcData = TcpListenFcData { @@ -997,7 +997,7 @@ impl io::Writer for TcpSocketBuf { fn tear_down_socket_data(socket_data: @TcpSocketData) { unsafe { let (closed_po, closed_ch) = stream::<()>(); - let closed_ch = SharedChan(closed_ch); + let closed_ch = SharedChan::new(closed_ch); let close_data = TcpSocketCloseData { closed_ch: closed_ch }; @@ -1147,7 +1147,7 @@ fn write_common_impl(socket_data_ptr: *TcpSocketData, vec::len(raw_write_data)) ]; let write_buf_vec_ptr = ptr::addr_of(&write_buf_vec); let (result_po, result_ch) = stream::<TcpWriteResult>(); - let result_ch = SharedChan(result_ch); + let result_ch = SharedChan::new(result_ch); let write_data = WriteReqData { result_ch: result_ch }; @@ -1554,7 +1554,7 @@ mod test { let (server_result_po, server_result_ch) = stream::<~str>(); let (cont_po, cont_ch) = stream::<()>(); - let cont_ch = SharedChan(cont_ch); + let cont_ch = SharedChan::new(cont_ch); // server let hl_loop_clone = hl_loop.clone(); do task::spawn_sched(task::ManualThreads(1u)) { @@ -1592,7 +1592,7 @@ mod test { let expected_resp = ~"pong"; let (cont_po, cont_ch) = stream::<()>(); - let cont_ch = SharedChan(cont_ch); + let cont_ch = SharedChan::new(cont_ch); // server let hl_loop_clone = hl_loop.clone(); do task::spawn_sched(task::ManualThreads(1u)) { @@ -1652,7 +1652,7 @@ mod test { let expected_resp = ~"pong"; let (cont_po, cont_ch) = stream::<()>(); - let cont_ch = SharedChan(cont_ch); + let cont_ch = SharedChan::new(cont_ch); // server let hl_loop_clone = hl_loop.clone(); do task::spawn_sched(task::ManualThreads(1u)) { @@ -1717,7 +1717,7 @@ mod test { let (server_result_po, server_result_ch) = stream::<~str>(); let (cont_po, cont_ch) = stream::<()>(); - let cont_ch = SharedChan(cont_ch); + let cont_ch = SharedChan::new(cont_ch); // server let iotask_clone = iotask.clone(); do task::spawn_sched(task::ManualThreads(1u)) { @@ -1764,7 +1764,7 @@ mod test { let expected_resp = ~"A string\nwith multiple lines\n"; let (cont_po, cont_ch) = stream::<()>(); - let cont_ch = SharedChan(cont_ch); + let cont_ch = SharedChan::new(cont_ch); // server let hl_loop_clone = hl_loop.clone(); do task::spawn_sched(task::ManualThreads(1u)) { @@ -1813,7 +1813,7 @@ mod test { cont_ch: SharedChan<()>, iotask: &IoTask) -> ~str { let (server_po, server_ch) = stream::<~str>(); - let server_ch = SharedChan(server_ch); + let server_ch = SharedChan::new(server_ch); let server_ip_addr = ip::v4::parse_addr(server_ip); let listen_result = listen(server_ip_addr, server_port, 128, iotask, diff --git a/src/libstd/test.rs b/src/libstd/test.rs index ee83a0c9bd6..4ccbf207170 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -446,7 +446,7 @@ fn run_tests(opts: &TestOpts, let mut pending = 0; let (p, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); while pending > 0 || !remaining.is_empty() { while pending < concurrency && !remaining.is_empty() { @@ -797,7 +797,7 @@ mod tests { testfn: DynTestFn(|| f()), }; let (p, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); run_test(false, desc, ch); let (_, res) = p.recv(); assert!(res != TrOk); @@ -815,7 +815,7 @@ mod tests { testfn: DynTestFn(|| f()), }; let (p, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); run_test(false, desc, ch); let (_, res) = p.recv(); assert!(res == TrIgnored); @@ -834,7 +834,7 @@ mod tests { testfn: DynTestFn(|| f()), }; let (p, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); run_test(false, desc, ch); let (_, res) = p.recv(); assert!(res == TrOk); @@ -852,7 +852,7 @@ mod tests { testfn: DynTestFn(|| f()), }; let (p, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); run_test(false, desc, ch); let (_, res) = p.recv(); assert!(res == TrFailed); diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index c229e72ae5d..e862fe6077c 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -43,7 +43,7 @@ pub fn delayed_send<T:Owned>(iotask: &IoTask, ch: &Chan<T>, val: T) { let (timer_done_po, timer_done_ch) = stream::<()>(); - let timer_done_ch = SharedChan(timer_done_ch); + let timer_done_ch = SharedChan::new(timer_done_ch); let timer = uv::ll::timer_t(); let timer_ptr = ptr::addr_of(&timer); do iotask::interact(iotask) |loop_ptr| { @@ -199,7 +199,7 @@ mod test { #[test] fn test_gl_timer_sleep_stress2() { let (po, ch) = stream(); - let ch = SharedChan(ch); + let ch = SharedChan::new(ch); let hl_loop = &uv::global_loop::get(); let repeat = 20u; diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index 3130abdc7cd..ac762d7d801 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -211,7 +211,7 @@ mod test { #[ignore] fn test_stress_gl_uv_global_loop_high_level_global_timer() { let (exit_po, exit_ch) = stream::<()>(); - let exit_ch = SharedChan(exit_ch); + let exit_ch = SharedChan::new(exit_ch); let cycles = 5000u; for iter::repeat(cycles) { let exit_ch_clone = exit_ch.clone(); diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs index 7a9d2438e6a..c7a78f38919 100644 --- a/src/libstd/uv_iotask.rs +++ b/src/libstd/uv_iotask.rs @@ -126,7 +126,7 @@ fn run_loop(iotask_ch: &Chan<IoTask>) { // while we dwell in the I/O loop let iotask = IoTask{ async_handle: async_handle, - op_chan: SharedChan(msg_ch) + op_chan: SharedChan::new(msg_ch) }; iotask_ch.send(iotask); @@ -230,7 +230,7 @@ fn impl_uv_iotask_async(iotask: &IoTask) { let (exit_po, exit_ch) = stream::<()>(); let ah_data = AhData { iotask: iotask.clone(), - exit_ch: SharedChan(exit_ch) + exit_ch: SharedChan::new(exit_ch) }; let ah_data_ptr: *AhData = unsafe { ptr::to_unsafe_ptr(&ah_data) @@ -293,7 +293,7 @@ fn test_uv_iotask_async() { // loop lives until, at least, all of the // impl_uv_hl_async() runs have been called, at least. let (work_exit_po, work_exit_ch) = stream::<()>(); - let work_exit_ch = SharedChan(work_exit_ch); + let work_exit_ch = SharedChan::new(work_exit_ch); for iter::repeat(7u) { let iotask_clone = iotask.clone(); let work_exit_ch_clone = work_exit_ch.clone(); diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs index 740ecec001f..ab3074e49dd 100644 --- a/src/libstd/uv_ll.rs +++ b/src/libstd/uv_ll.rs @@ -1717,12 +1717,12 @@ mod test { let kill_server_msg = ~"does a dog have buddha nature?"; let server_resp_msg = ~"mu!"; let (client_port, client_chan) = stream::<~str>(); - let client_chan = SharedChan(client_chan); + let client_chan = SharedChan::new(client_chan); let (server_port, server_chan) = stream::<~str>(); - let server_chan = SharedChan(server_chan); + let server_chan = SharedChan::new(server_chan); let (continue_port, continue_chan) = stream::<bool>(); - let continue_chan = SharedChan(continue_chan); + let continue_chan = SharedChan::new(continue_chan); let kill_server_msg_copy = copy kill_server_msg; let server_resp_msg_copy = copy server_resp_msg; |
