diff options
| author | Philipp Brüschweiler <blei42@gmail.com> | 2013-06-04 12:03:58 +0200 |
|---|---|---|
| committer | Philipp Brüschweiler <blei42@gmail.com> | 2013-06-04 12:03:58 +0200 |
| commit | 34ee63e93bd763326e676bd634f6f17a8f77791d (patch) | |
| tree | 844bf025d2763daf4913cd7ae965803c20e0e2a3 /src/libextra | |
| parent | 133d45171564c8b7de14523c9f3aa87140b9f043 (diff) | |
| download | rust-34ee63e93bd763326e676bd634f6f17a8f77791d.tar.gz rust-34ee63e93bd763326e676bd634f6f17a8f77791d.zip | |
std::cell: Modernize constructors
Part of #3853
Diffstat (limited to 'src/libextra')
| -rw-r--r-- | src/libextra/arc.rs | 2 | ||||
| -rw-r--r-- | src/libextra/flatpipes.rs | 4 | ||||
| -rw-r--r-- | src/libextra/future.rs | 6 | ||||
| -rw-r--r-- | src/libextra/net_tcp.rs | 4 | ||||
| -rw-r--r-- | src/libextra/rc.rs | 4 | ||||
| -rw-r--r-- | src/libextra/sync.rs | 4 | ||||
| -rw-r--r-- | src/libextra/test.rs | 2 | ||||
| -rw-r--r-- | src/libextra/timer.rs | 2 | ||||
| -rw-r--r-- | src/libextra/workcache.rs | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs index 6c838a82a2f..15c24052563 100644 --- a/src/libextra/arc.rs +++ b/src/libextra/arc.rs @@ -558,7 +558,7 @@ mod tests { let arc = ~MutexARC(false); let arc2 = ~arc.clone(); let (p,c) = comm::oneshot(); - let (c,p) = (Cell(c), Cell(p)); + let (c,p) = (Cell::new(c), Cell::new(p)); do task::spawn || { // wait until parent gets in comm::recv_one(p.take()); diff --git a/src/libextra/flatpipes.rs b/src/libextra/flatpipes.rs index 31218ca9a0a..5efd6c33804 100644 --- a/src/libextra/flatpipes.rs +++ b/src/libextra/flatpipes.rs @@ -791,8 +791,8 @@ mod test { let addr0 = ip::v4::parse_addr("127.0.0.1"); - let begin_connect_chan = Cell(begin_connect_chan); - let accept_chan = Cell(accept_chan); + let begin_connect_chan = Cell::new(begin_connect_chan); + let accept_chan = Cell::new(accept_chan); // The server task let addr = copy addr0; diff --git a/src/libextra/future.rs b/src/libextra/future.rs index 25a3259c696..40cfeebd5dc 100644 --- a/src/libextra/future.rs +++ b/src/libextra/future.rs @@ -109,7 +109,7 @@ pub fn from_port<A:Owned>(port: PortOne<A>) -> Future<A> { * waiting for the result to be received on the port. */ - let port = Cell(port); + let port = Cell::new(port); do from_fn { recv_one(port.take()) } @@ -137,7 +137,7 @@ pub fn spawn<A:Owned>(blk: ~fn() -> A) -> Future<A> { let (port, chan) = oneshot(); - let chan = Cell(chan); + let chan = Cell::new(chan); do task::spawn { let chan = chan.take(); send_one(chan, blk()); @@ -204,7 +204,7 @@ mod test { #[test] fn test_sendable_future() { let expected = "schlorf"; - let f = Cell(do spawn { expected }); + let f = Cell::new(do spawn { expected }); do task::spawn { let mut f = f.take(); let actual = f.get(); diff --git a/src/libextra/net_tcp.rs b/src/libextra/net_tcp.rs index 960319b9c3f..87ebfdfb797 100644 --- a/src/libextra/net_tcp.rs +++ b/src/libextra/net_tcp.rs @@ -1830,7 +1830,7 @@ mod test { let (server_po, server_ch) = stream::<~str>(); let server_ch = SharedChan::new(server_ch); let server_ip_addr = ip::v4::parse_addr(server_ip); - let resp_cell = Cell(resp); + let resp_cell = Cell::new(resp); let listen_result = listen(server_ip_addr, server_port, 128, iotask, // on_establish_cb -- called when listener is set up @@ -1842,7 +1842,7 @@ mod test { // risky to run this on the loop, but some users // will want the POWER |new_conn, kill_ch| { - let resp_cell2 = Cell(resp_cell.take()); + let resp_cell2 = Cell::new(resp_cell.take()); debug!("SERVER: new connection!"); let (cont_po, cont_ch) = stream(); let server_ch = server_ch.clone(); diff --git a/src/libextra/rc.rs b/src/libextra/rc.rs index 1ec72f2ea9f..96ad629ea83 100644 --- a/src/libextra/rc.rs +++ b/src/libextra/rc.rs @@ -105,7 +105,7 @@ mod test_rc { #[test] fn test_clone() { - let x = rc_from_owned(Cell(5)); + let x = rc_from_owned(Cell::new(5)); let y = x.clone(); do x.borrow().with_mut_ref |inner| { *inner = 20; @@ -115,7 +115,7 @@ mod test_rc { #[test] fn test_deep_clone() { - let x = rc_from_owned(Cell(5)); + let x = rc_from_owned(Cell::new(5)); let y = x.deep_clone(); do x.borrow().with_mut_ref |inner| { *inner = 20; diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs index 79ecf4abbee..8f09ddea9ba 100644 --- a/src/libextra/sync.rs +++ b/src/libextra/sync.rs @@ -818,7 +818,7 @@ mod tests { let s = ~semaphore(1); let s2 = ~s.clone(); let (p,c) = comm::stream(); - let child_data = Cell((s2, c)); + let child_data = Cell::new((s2, c)); do s.access { let (s2, c) = child_data.take(); do task::spawn || { @@ -999,7 +999,7 @@ mod tests { let mut sibling_convos = ~[]; for 2.times { let (p,c) = comm::stream(); - let c = Cell(c); + let c = Cell::new(c); sibling_convos.push(p); let mi = ~m2.clone(); // spawn sibling task diff --git a/src/libextra/test.rs b/src/libextra/test.rs index 99903be8b22..6a9751b66e0 100644 --- a/src/libextra/test.rs +++ b/src/libextra/test.rs @@ -568,7 +568,7 @@ pub fn run_test(force_ignore: bool, fn run_test_inner(desc: TestDesc, monitor_ch: SharedChan<MonitorMsg>, testfn: ~fn()) { - let testfn_cell = ::core::cell::Cell(testfn); + let testfn_cell = ::core::cell::Cell::new(testfn); do task::spawn { let mut result_future = None; // task::future_result(builder); diff --git a/src/libextra/timer.rs b/src/libextra/timer.rs index 4f662613b00..f2513366663 100644 --- a/src/libextra/timer.rs +++ b/src/libextra/timer.rs @@ -282,7 +282,7 @@ mod test { for (times as uint).times { let mut rng = rand::rng(); - let expected = Cell(rng.gen_str(16u)); + let expected = Cell::new(rng.gen_str(16u)); let (test_po, test_ch) = stream::<~str>(); let hl_loop_clone = hl_loop.clone(); do task::spawn() { diff --git a/src/libextra/workcache.rs b/src/libextra/workcache.rs index 5d494b1b916..b2fd998b73f 100644 --- a/src/libextra/workcache.rs +++ b/src/libextra/workcache.rs @@ -347,7 +347,7 @@ impl TPrep for Prep { _ => { let (port, chan) = oneshot(); let blk = replace(&mut bo, None).unwrap(); - let chan = Cell(chan); + let chan = Cell::new(chan); do task::spawn { let exe = Exec { |
