Rollup of 12 pull requests #35652
Closed
Rollup of 12 pull requests #35652
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
Contributor
sophiajt
commented
Aug 13, 2016
sophiajt
commented
- Successful merges: Update compiler error 0093 to use new error format #35346, Update E0220 message to new format #35412, Update E0033 to the new error format #35526, Update error message for E0253 #35512 #35558, Update E0138 to new format #35573, E0248, E0267 & E0268 Change into issue format #35586, Add label to E0254 #35596, Update E0070 to new error format #35615, changed E0067 to new error format #35616, Update E0301 to the new format #35643, Update E0302 to the new format #35644, E0094 error message updated #35646
- Failed merges:
E0248 Change in issue format E0267 UT New Format E0268 UT New Format E0267 & E0268 New Error Format
changed error text
This issue rust-lang#35513 is a part of rust-lang#35233. r? @jonathandturner
Part of rust-lang#35233 Fixes rust-lang#35231
…handturner Update compiler error 0093 to use new error format Addresses rust-lang#35230, Part of the rust-lang#35233 meta bug r? @jonathandturner
Update E0220 message to new format Part of rust-lang#35233 . Fixes rust-lang#35385. r? @jonathandturner Should it keep E0191?
Update E0033 to the new error format Part of rust-lang#35233 Addresses rust-lang#35498 "r? @jonathandturner
Update error message for E0253 rust-lang#35512 Fixes rust-lang#35512. Part of rust-lang#35233.
Update E0138 to new format Part of rust-lang#35233 Fix rust-lang#35510 r? @jonathandturner  Question: How can I only underline the function name ? I have observed the debug output and the struct of item, but I can't find the `Span` for function name. Should I modify the struct I get to save function name's position or there is another way to get it ? (I can only find `Span`s for function attributes, inputs, outputs, blocks)
…turner E0248, E0267 & E0268 Change into issue format r? @jonathandturner Part of rust-lang#35391, rust-lang#35519 and rust-lang#35520. I have squashed all changes into a single commit. Please review the changes. E0248 Change in issue format E0267 UT New Format E0268 UT New Format E0267 & E0268 New Error Format
…ts, r=jonathandturner Add label to E0254 This issue rust-lang#35513 is a part of rust-lang#35233. r? @jonathandturner
… r=jonathandturner Update E0070 to new error format Updated E0070 to new error format. Part of rust-lang#35233 Fixes rust-lang#35503 Thanks for letting me help! r? @jonathandturner
… r=jonathandturner changed E0067 to new error format Updated E0067 to new error format. Part of rust-lang#35233 Fixes rust-lang#35502 Passes all the tests when running: `python src/bootstrap/bootstrap.py --step check-cfail --stage 1` **This seems strange, given that the format for E0067 has been changed.** It feels like it should fail some unit tests maybe? Let me know if I'm mistaken. Otherwise I can create a unit test for it. Thanks for letting me help! r? @jonathandturner
…ormat, r=jonathandturner Update E0301 to the new format Part of rust-lang#35233. Fixes rust-lang#35522. r? @jonathandturner
…ormat, r=jonathandturner Update E0302 to the new format Part of rust-lang#35233. Fixes rust-lang#35523. r? @jonathandturner
E0094 error message updated Part of rust-lang#35233 Fixes rust-lang#35231 r? @jonathandturner
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 |
|
📌 Commit 913d2f7 has been approved by |
|
@bors r+ p=10 |
|
📌 Commit 5e9dc84 has been approved by |
|
⌛ Testing commit 5e9dc84 with merge 1ce37cd... |
|
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
|
☔ The latest upstream changes (presumably #35666) made this pull request unmergeable. Please resolve the merge conflicts. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.