Skip to content

Commit 092e309

Browse files
committed
---
yaml --- r: 271791 b: refs/heads/auto c: 708c5d0 h: refs/heads/master i: 271789: cf325c6 271787: 8d29d59 271783: 3332be3 271775: f10bd7f
1 parent 6959ad5 commit 092e309

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: bbba872dde00b7947e75c6055dba5c82f2f7978a
11+
refs/heads/auto: 708c5d09d7a355c506960581e16306c96eb7d019
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/book/macros.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ which syntactic form it matches.
470470
* `ty`: a type. Examples: `i32`; `Vec<(char, String)>`; `&T`.
471471
* `pat`: a pattern. Examples: `Some(t)`; `(17, 'a')`; `_`.
472472
* `stmt`: a single statement. Example: `let x = 3`.
473-
* `block`: a brace-delimited sequence of statements and optional an expression. Example:
473+
* `block`: a brace-delimited sequence of statements and optionally an expression. Example:
474474
`{ log(error, "hi"); return 12; }`.
475475
* `item`: an [item][item]. Examples: `fn foo() { }`; `struct Bar;`.
476476
* `meta`: a "meta item", as found in attributes. Example: `cfg(target_os = "windows")`.
@@ -509,7 +509,7 @@ A macro defined within the body of a single `fn`, or anywhere else not at
509509
module scope, is visible only within that item.
510510

511511
If a module has the `macro_use` attribute, its macros are also visible in its
512-
parent module after its `mod` item. If the parent also has `macro_use`
512+
parent module after the child’s `mod` item. If the parent also has `macro_use`
513513
then the macros will be visible in the grandparent after the parent’s `mod`
514514
item, and so forth.
515515

0 commit comments

Comments
 (0)