Some more grammar.md improvements #25297
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Namely an optional "pub" before any item. The "pub" in the Use declaration section should use this too.
The syntax for re-exporting privacy is covered in the use declaration item.
Some of this text is duplicated in the reference (and belongs there) so remove it. It says item grammar is the same, so point to that grammar section.
Both external crate declarations and use declarations need to end with a semicolon.
Between ffc5f1c, when grammar.md was created by copying parts of the reference, and 8cf2552, when all EBNF was removed from reference.md, there were parts of the grammar that were updated in reference.md but not grammar.md, and then they weren't copied over because they existed already, but they were slightly out of date. Example: the `path_item : ident | "self" ;` rule in Use declarations was changed from "mod" to "self" in the reference in 195fd9a but wasn't updated in the grammar.
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ rollup |
|
📌 Commit 218d38f has been approved by |
|
🤘 |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 11, 2015
…eklabnik Hiiii, I've got another chunk of updates to the grammar documentation! ⭐ 🌟 🌠 Chipping away at rust-lang#22445, still have some more to go. I'm learning so much!!!
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 11, 2015
…eklabnik Hiiii, I've got another chunk of updates to the grammar documentation! ⭐ 🌟 🌠 Chipping away at rust-lang#22445, still have some more to go. I'm learning so much!!!
bors
added a commit
that referenced
this pull request
May 11, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hiiii, I've got another chunk of updates to the grammar documentation! ⭐ 🌟 🌠
Chipping away at #22445, still have some more to go. I'm learning so much!!!