Rollup of 7 pull requests #25352
Closed
Rollup of 7 pull requests #25352
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
steveklabnik
commented
May 13, 2015
steveklabnik
commented
- Successful merges: Add test for #15919 #24987, std: Update crate docs #25224, TRPL: Drop #25317, TRPL: dining philosophers #25321, readme: Rework the arch support matrix #25324, Add some more error explanations #25328, Record correct span for static mut items in trans/save #25333
- Failed merges: TRPL: release channels #25174, book: typo fixes, wording improvements. #25334, TRPL: embedding rust #25341
Attempted to organize them in a way more relevant to what newbies would be interested in hearing.
This also updates the error message to remove mention of "managed heap", which was removed in 8a91d33.
This error code has been removed.
The text in iterators.md wasn't wrong, but it read awkwardly to my ear.
I've just added a link instead to the lifetime elision section of the book.
Attempted to organize them in a way more relevant to what newbies would be interested in hearing. I am not satisfied by this at all, but by virtue of deleting old links alone I think it is an improvement. r? @steveklabnik
…xcrichton This is a little rough, and it needs squashed and section headers, but i'd like to get some eyes on it sooner rather than later.
This makes the compatibility matrix render a little nicer on github, and also removes a note about windows support from 0.12 (Which is immaterial now that we're approaching 1.0)
Adds long diagnostic messages for the following error codes: - E0049 - E0050 - E0066 - E0069 - E0106 - E0107 - E0166 - E0201 - E0322 cc rust-lang#24407
As it is, save-analysis appears to return the span for the 'mut' in a declaration 'static mut identifier...' instead of the identifier. This minor change appears to fix the problem, by skipping the mut when it is present.
|
Manually merged in the three that didn't automatically merge. |
|
@bors: r+ p=1 |
|
📌 Commit 2c01eac has been approved by |
|
@bors: force |
|
@bors: r- |
|
@bors: r+ p=1 |
|
📌 Commit 758d568 has been approved by |
|
@bors: force |
|
⌛ Testing commit 758d568 with merge bd5fb16... |
|
💔 Test failed - auto-mac-64-opt |
|
@bors: retry |
|
@bors: force |
|
⌛ Testing commit 758d568 with merge f855894... |
|
💔 Test failed - auto-mac-64-nopt-t |
|
@bors: r+ p=1 |
|
📌 Commit 1d34f92 has been approved by |
|
@bors: retry |
|
@bors: force |
|
⌛ Testing commit 1d34f92 with merge 25b08b4... |
|
💔 Test failed - auto-mac-32-opt |
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.