diff options
| author | bors <bors@rust-lang.org> | 2015-03-23 00:37:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-23 00:37:35 +0000 |
| commit | 809a554fca2d0ebc2ba50077016fe282a4064752 (patch) | |
| tree | eb7494e5b785d5abb724393c4ade43ed572f9c89 /src/doc | |
| parent | b0aad7dd4fad8d7e2e2f877a511a637258949597 (diff) | |
| parent | b4e9106a8a476c2b77e2c4cd8717a9bc1b95de52 (diff) | |
| download | rust-809a554fca2d0ebc2ba50077016fe282a4064752.tar.gz rust-809a554fca2d0ebc2ba50077016fe282a4064752.zip | |
Auto merge of #23593 - Manishearth:rollup, r=Manishearth
(yay, no Saturday)
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/reference.md | 6 | ||||
| -rw-r--r-- | src/doc/trpl/SUMMARY.md | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md index 92573d79217..415ec4e4fbf 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -1982,7 +1982,7 @@ the namespace hierarchy as it normally would. ## Attributes ```{.ebnf .gram} -attribute : "#!" ? '[' meta_item ']' ; +attribute : '#' '!' ? '[' meta_item ']' ; meta_item : ident [ '=' literal | '(' meta_seq ')' ] ? ; meta_seq : meta_item [ ',' meta_seq ] ? ; @@ -3158,7 +3158,7 @@ ten_times(|j| println!("hello, {}", j)); ### While loops ```{.ebnf .gram} -while_expr : "while" no_struct_literal_expr '{' block '}' ; +while_expr : [ lifetime ':' ] "while" no_struct_literal_expr '{' block '}' ; ``` A `while` loop begins by evaluating the boolean loop conditional expression. @@ -3223,7 +3223,7 @@ A `continue` expression is only permitted in the body of a loop. ### For expressions ```{.ebnf .gram} -for_expr : "for" pat "in" no_struct_literal_expr '{' block '}' ; +for_expr : [ lifetime ':' ] "for" pat "in" no_struct_literal_expr '{' block '}' ; ``` A `for` expression is a syntactic construct for looping over elements provided diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/trpl/SUMMARY.md index 6ff51e8d1b9..76f8b6c9738 100644 --- a/src/doc/trpl/SUMMARY.md +++ b/src/doc/trpl/SUMMARY.md @@ -1,6 +1,6 @@ # Summary -* [I: The Basics](basic.md) +* [The Basics](basic.md) * [Installing Rust](installing-rust.md) * [Hello, world!](hello-world.md) * [Hello, Cargo!](hello-cargo.md) @@ -14,7 +14,7 @@ * [Strings](strings.md) * [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md) * [Standard Input](standard-input.md) -* [II: Intermediate Rust](intermediate.md) +* [Intermediate Rust](intermediate.md) * [Crates and Modules](crates-and-modules.md) * [Testing](testing.md) * [Pointers](pointers.md) @@ -31,7 +31,7 @@ * [Concurrency](concurrency.md) * [Error Handling](error-handling.md) * [Documentation](documentation.md) -* [III: Advanced Topics](advanced.md) +* [Advanced Topics](advanced.md) * [FFI](ffi.md) * [Unsafe Code](unsafe.md) * [Advanced Macros](advanced-macros.md) |