Rollup of 6 pull requests #35476
Closed
Rollup of 6 pull requests #35476
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
Contributor
sophiajt
commented
Aug 7, 2016
sophiajt
commented
- Successful merges: Update E0191 to the new error format #35396, Update E0206 message to new format #35402, Update E0023 to the new format #35446, book: fix formatting of module layout example #35466, Update E0214 to the new error format #35470, E0248, E0267 & E0268 New Format #35475
- Failed merges: Update E0057 error message to new format #35395, Update compiler error 0030 to use new error format. #35415
Added some extra code to check for the appropriate ending for numbers == 1 vs. not 1 in error messages. Added an extra test so that the plural suffix is seen and exercised.
Update E0191 to the new error format Part of rust-lang#35233 "r? @jonathandturner
…Gomez Update E0206 message to new format Part of rust-lang#35233. Fixes rust-lang#35301. r? @GuillaumeGomez
…onathandturner Update E0023 to the new format Added some extra code to check for the appropriate ending for numbers == 1 vs. not 1 in error messages. Added an extra test so that the plural suffix is seen and exercised.
book: fix formatting of module layout example
Update E0214 to the new error format Part of rust-lang#35233 Addresses rust-lang#35383 "r? @jonathandturner
…urner E0248 New Format
|
@bors r+ |
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
|
📌 Commit 09e2e04 has been approved by |
|
⌛ Testing commit 09e2e04 with merge 8913330... |
bors
added a commit
that referenced
this pull request
Aug 7, 2016
|
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
|
☔ The latest upstream changes (presumably #35402) made this pull request unmergeable. Please resolve the merge conflicts. |
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.