diff options
| author | bors <bors@rust-lang.org> | 2014-05-04 20:51:43 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-04 20:51:43 -0700 |
| commit | 3179cd50aec016ed9d4daf44d4f21d9e0c0419a0 (patch) | |
| tree | d0ff48c0d7d0db965b9cb1028161d3aaf32bef1e | |
| parent | 1b5bbbf87792859c0f9bb797688259b19f626ab0 (diff) | |
| parent | 9246682b061e80c954e93e22484236f9d3def80f (diff) | |
| download | rust-3179cd50aec016ed9d4daf44d4f21d9e0c0419a0.tar.gz rust-3179cd50aec016ed9d4daf44d4f21d9e0c0419a0.zip | |
auto merge of #13924 : gmjosack/rust/master, r=alexcrichton
Most of the links I've removed are for types that don't exist anymore with the exception of `SendReceiver` though I'm not sure how useful it is to link to that without the accompanying `Receiver` and `Sender` and I don't know how useful those links are when they're discussed below and `channel`/`sync_channel` is on the `std::comm` page already linked.
| -rw-r--r-- | src/doc/guide-tasks.md | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/doc/guide-tasks.md b/src/doc/guide-tasks.md index 1ce2cd39fd6..b7cc85c4c1a 100644 --- a/src/doc/guide-tasks.md +++ b/src/doc/guide-tasks.md @@ -48,13 +48,7 @@ concurrency at this writing: * [`std::task`] - All code relating to tasks and task scheduling, * [`std::comm`] - The message passing interface, * [`sync::DuplexStream`] - An extension of `pipes::stream` that allows both sending and receiving, -* [`sync::SyncSender`] - An extension of `pipes::stream` that provides synchronous message sending, -* [`sync::SyncReceiver`] - An extension of `pipes::stream` that acknowledges each message received, -* [`sync::rendezvous`] - Creates a stream whose channel, upon sending a message, blocks until the - message is received. * [`sync::Arc`] - The Arc (atomically reference counted) type, for safely sharing immutable data, -* [`sync::RWArc`] - A dual-mode Arc protected by a reader-writer lock, -* [`sync::MutexArc`] - An Arc with mutable data protected by a blocking mutex, * [`sync::Semaphore`] - A counting, blocking, bounded-waiting semaphore, * [`sync::Mutex`] - A blocking, bounded-waiting, mutual exclusion lock with an associated FIFO condition variable, @@ -70,13 +64,8 @@ concurrency at this writing: [`std::task`]: std/task/index.html [`std::comm`]: std/comm/index.html [`sync::DuplexStream`]: sync/struct.DuplexStream.html -[`sync::SyncSender`]: sync/struct.SyncSender.html -[`sync::SyncReceiver`]: sync/struct.SyncReceiver.html -[`sync::rendezvous`]: sync/fn.rendezvous.html [`sync::Arc`]: sync/struct.Arc.html -[`sync::RWArc`]: sync/struct.RWArc.html -[`sync::MutexArc`]: sync/struct.MutexArc.html -[`sync::Semaphore`]: sync/struct.Semaphore.html +[`sync::Semaphore`]: sync/raw/struct.Semaphore.html [`sync::Mutex`]: sync/struct.Mutex.html [`sync::RWLock`]: sync/struct.RWLock.html [`sync::Barrier`]: sync/struct.Barrier.html |