Rollup of 3 pull requests #25560
Merged
Rollup of 3 pull requests #25560
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
Member
Manishearth
commented
May 18, 2015
Manishearth
commented
- Successful merges: Fix typo in references-and-borrowing docs #25526, trpl/closures: Fix whitespace #25530, Revert "Panic if the grammar verifier sees a token it doesn't recognize" #25537
- Failed merges:
This reverts commit 9c7d5ae. This was wrong... the `continue` was to ignore the latter half of the tokens file. Another mechanism will have to be used to keep the model grammar's tokens in sync with the actual grammar's tokens :-/
…x, r=alexcrichton Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :) The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either. r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
…richton Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections: ``` EQ=1 LT=2 LE=3 EQEQ=4 NE=5 ... COMMENT=56 SHEBANG=57 UTF8_BOM=58 '='=1 '<'=2 '<='=3 '=='=4 ... ``` and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file. I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
|
@bors: r+ force p=10 |
|
📌 Commit 5ed02b5 has been approved by |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 5ed02b5 with merge eb2bbb0... |
|
💔 Test failed - auto-linux-64-nopt-t |
|
@bors: retry |
|
@bors: force |
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.