Skip to content

Commit

Permalink
auto merge of #9223 : sfackler/rust/tasks-fix, r=catamorphism
Browse files Browse the repository at this point in the history
This module was removed a while ago, but the tasks tutorial wasn't
updated, and the old docs page for pipes was never deleted so the link
confusingly still worked!
  • Loading branch information
bors committed Sep 16, 2013
2 parents 0ec4d34 + 555589e commit bc89ade
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions doc/tutorial-tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,14 @@ concurrency at this writing:

* [`std::task`] - All code relating to tasks and task scheduling,
* [`std::comm`] - The message passing interface,
* [`std::pipes`] - The underlying messaging infrastructure,
* [`extra::comm`] - Additional messaging types based on `std::pipes`,
* [`extra::comm`] - Additional messaging types based on `std::comm`,
* [`extra::sync`] - More exotic synchronization tools, including locks,
* [`extra::arc`] - The Arc (atomically reference counted) type,
for safely sharing immutable data,
* [`extra::future`] - A type representing values that may be computed concurrently and retrieved at a later time.

[`std::task`]: std/task.html
[`std::comm`]: std/comm.html
[`std::pipes`]: std/pipes.html
[`extra::comm`]: extra/comm.html
[`extra::sync`]: extra/sync.html
[`extra::arc`]: extra/arc.html
Expand Down Expand Up @@ -125,7 +123,7 @@ receiving messages. Pipes are low-level communication building-blocks and so
come in a variety of forms, each one appropriate for a different use case. In
what follows, we cover the most commonly used varieties.

The simplest way to create a pipe is to use the `pipes::stream`
The simplest way to create a pipe is to use the `comm::stream`
function to create a `(Port, Chan)` pair. In Rust parlance, a *channel*
is a sending endpoint of a pipe, and a *port* is the receiving
endpoint. Consider the following example of calculating two results
Expand Down

0 comments on commit bc89ade

Please sign in to comment.