auto merge of #13332 : mbrubeck/rust/doc-edit, r=huonw

Also add the new `proc` keyword to the documentation.
This commit is contained in:
bors 2014-04-05 07:21:36 -07:00
commit 2dcdc75c6c
2 changed files with 5 additions and 6 deletions

View File

@ -206,13 +206,12 @@ The keywords are the following strings:
as
break
crate
do
else enum extern
false fn for
if impl in
let loop
match mod mut
priv pub
priv proc pub
ref return
self static struct super
true trait type
@ -2558,12 +2557,12 @@ task in a _failing state_.
~~~~ {.ignore}
# use std::task;
# do task::spawn {
# task::spawn(proc() {
([1, 2, 3, 4])[0];
(["a", "b"])[10]; // fails
# }
# })
~~~~
### Unary operator expressions

View File

@ -165,12 +165,12 @@ that one can still write things like `#[deriving(Eq)]`).
# // what's actually being documented.
# fn fib(n: int) { n + 2 }
do spawn { fib(200); }
spawn(proc() { fib(200); })
```
*/
# fn foo() {}
The documentation online would look like `do spawn { fib(200); }`, but when
The documentation online would look like `spawn(proc() { fib(200); })`, but when
testing this code, the `fib` function will be included (so it can compile).
## Running tests (advanced)