Rollup of 16 pull requests #25175
Merged
Rollup of 16 pull requests #25175
Conversation
This file contains 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
steveklabnik
commented
May 7, 2015
- Successful merges: Added error explanations for E0308, E0309, and E0310 #24576, Improve diagnostics for E0282 #24966, Update "Miscellaneous attributes" section of reference manual #25052, Update with correct output. #25131, Fix token declaration and verification in the model lexer #25137, fix typos caught by codespell #25138, Fix indentation in the "Strings" chapter #25139, Fix explanation of Cargo's behavior #25141, doc: Fix link of repr attribute #25142, Iter Docs: Mention 'reduce' and 'inject' #25144, Add note about type signature searching to docs #25146, Correct initial guessing game example. Fixes #25147. r? @steveklabnik #25148, doc: Fix remove unused variable #25154, doc: Fix remove secret number at final source #25156, Remove schedule_free_slice #25160, doc: fix syntax error in Guessing Game #25173
- Failed merges:
The error can also occur in cases where a type annotation will not help.
The new example uses a `char` iterator instead of `i32`, to avoid interplay between type inference and the default type for integer literals.
This appears to not have too much of a detrimental effect, but it doesn't seem to be what is intended either. antlr doesn't mind that `PLUS` isn't declared in `tokens` and happily uses the `PLUS` that appears later in the file, but the generated RustLexer.tokens had PLUS at the end rather than where it was intended: NOT=10 TILDE=11 PLUT=12 MINUS=13 ... PLUS=56
There were some tokens used in the grammar but not declared. Antlr doesn't really seem to care and happily uses them, but they appear in RustLexer.tokens in a potentially-unexpected order.
To prevent the reference grammar from getting out of sync with the real grammar, panic if RustLexer.tokens contains an unknown token in a similar way that verify.rs panics if it encounters an unknown binary operation token.
This commit depends on rust-lang#25148.
Remove printing of secret number at final source.
Nothing uses it anymore.
The error message was misleading, so I adjusted it, and I also added the long diagnostics for this error (resolves one point in rust-lang#24407). I was unsure about how to phrase the error message. Is “generic parameter binding” the correct term for this?
…klabnik Unsafe destructors were removed, added remarks about needed feature gates. cc rust-lang#16676 r? @steveklabnik
…, r=alexcrichton I know this is the most trivial thing since it's *just* the model lexer, not the real lexer, but [it is simpler to read](rust-lang#15883 (comment)) and it'd be great if it was up to date but [it's been rotting](rust-lang#22379) and this is a tiny bit of that. Thanks!!!!!!
…steveklabnik Enhance Google-ability of `.fold()` by mentioning 'reduce' and 'inject' in the docs. Motivation: [This thread on users.rust-lang.org](https://users.rust-lang.org/t/find-the-shortest-string-in-a-vector/1247)
…bnik I noticed this feature added in rust-lang#23289 was missing from the `Search tricks`. Thanks! r? @steveklabnik
Let me know if I didn't follow correct procedure - seems a trivial change and no one that can be automatically tested.
Edit version of rust-lang#25150. This commit depends on rust-lang#25148.
Remove printing of secret number at final source.
…e, r=cmr Nothing uses it anymore.
… r=steveklabnik
|
@bors: r+ p=1 force |
|
r? @Aatch (rust_highfive has picked a reviewer for you, use r? to override) |
|
📌 Commit 5ac5203 has been approved by |
This was referenced May 7, 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.