---

yaml
---
r: 40828
b: refs/heads/dist-snap
c: b0fc222
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a9601bce10ac5d037b0d1ce532196f08f4b7fd95
+refs/heads/dist-snap: b0fc222fda0e49d55ac3eaf0ca35a43f6d9ed626
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/rust.md

@@ -858,13 +858,14 @@ If a sequence of such redirections form a cycle or cannot be unambiguously resol
 
 An example of re-exporting:
 ~~~~
+# fn main() { }
 mod quux {
-    mod foo {
+    pub mod foo {
         pub fn bar() { }
         pub fn baz() { }
     }
     
-    pub use foo::*;
+    pub use quux::foo::*;
 }
 ~~~~
 
@@ -3036,67 +3037,6 @@ An executing task can yield control at any time, by making a library call to
 non-executing state (blocked, dead) similarly deschedules the task.
 
 
-### Spawning tasks
-
-A call to `core::task::spawn`, passing a 0-argument function as its single
-argument, causes the runtime to construct a new task executing the passed
-function. The passed function is referred to as the _entry function_ for
-the spawned task, and any captured environment it carries is moved from the
-spawning task to the spawned task before the spawned task begins execution.
-
-The result of a `spawn` call is a `core::task::Task` value.
-
-An example of a `spawn` call:
-
-~~~~
-let po = comm::Port();
-let ch = comm::Chan(&po);
-
-do task::spawn {
-    // let task run, do other things
-    ...
-    comm::send(ch, true);
-};
-
-let result = comm::recv(po);
-~~~~
-
-
-### Sending values into channels
-
-Sending a value into a channel is done by a library call to `core::comm::send`,
-which takes a channel and a value to send, and moves the value into the
-channel's outgoing buffer.
-
-An example of a send:
-
-~~~~
-let po = comm::Port();
-let ch = comm::Chan(&po);
-comm::send(ch, ~"hello, world");
-~~~~
-
-
-### Receiving values from ports
-
-Receiving a value is done by a call to the `recv` method on a value of type
-`core::comm::Port`. This call causes the receiving task to enter the *blocked
-reading* state until a value arrives in the port's receive queue, at which
-time the port deques a value to return, and un-blocks the receiving task.
-
-An example of a *receive*:
-
-~~~~~~~~
-# let po = comm::Port();
-# let ch = comm::Chan(&po);
-# comm::send(ch, ~"");
-let s = comm::recv(po);
-~~~~~~~~
-
-> **Note:** this communication system will be replaced by a higher-performance system called "pipes",
-> in future versions of Rust.
-
-
 # Runtime services, linkage and debugging