bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
src/doc/rust.md
View file

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

4
src/doc/rustdoc.md
View file

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