Uh oh!
There was an error while loading. Please reload this page.
Rollup of 13 pull requests - #27194
Closed
steveklabnik wants to merge 32 commits into
Closed
Conversation
steveklabnik
commented
Jul 21, 2015
Contributor
- Successful merges: Error message for E0307 is weird #26485 #26778, Add diagnostics for E0172, fix inline message for E0139 #27127, add test for #20162 #27131, Add a test for #26468 #27140, add test for #14229 #27146, add test for #19404 #27147, s/has gained/has not gained/g #27151, add test for #10436 #27154, Fix wording nit for E0253 #27156, Document iterators in std::io #27157, add test for #14382 #27158, Document structures in std::io::utils #27164, Update docs for take and broadcast #27167
- Failed merges:
Print error followed by expected to make the error more clear
Conflicts: src/librustc/middle/ty.rs
The fix for rust-lang#26468 was made upstream and landed with the LLVM update in rust-lang#27076. Closesrust-lang#26468
I'm pretty sure this was a typo
Make them all consistent and link up the documentation.
These provide various special readers, so point their docs to their constructor functions in a manner consistent with everything else.
Better and more consistent links to their creators.
Print the error message and then what is expected by the repeat count so the output makes more sense when there is an error in the const expression
…arth As title :-) Part of rust-lang#24407. r? @Manishearth
The fix for rust-lang#26468 was made upstream and landed with the LLVM update in rust-lang#27076. Closesrust-lang#26468
I'm pretty sure this was a typo
…arth This is a resubmission of my previous git failure - apologies. Just fixing up a wording error that was discovered in E0253 after the r. r? @Manishearth
…r=alexcrichton Make them all consistent and link up the documentation. r? @alexcrichton
…ichton These provide various special readers, so point their docs to their constructor functions in a manner consistent with everything else. r? @alexcrichton
…xcrichton Better and more consistent links to their creators.
steveklabnik
commented
Jul 21, 2015
ContributorAuthor
@bors: r+ p=1000 |
bors
commented
Jul 21, 2015
Collaborator
📌 Commit da8036e has been approved by |
rust-highfive
commented
Jul 21, 2015
Contributor
(rust_highfive has picked a reviewer for you, use r? to override) |
bors
commented
Jul 21, 2015
Collaborator
⌛ Testing commit da8036e with merge 714da08... |
bors
commented
Jul 21, 2015
Collaborator
💔 Test failed - auto-mac-64-opt |
steveklabnik
commented
Jul 21, 2015
ContributorAuthor
@bors: retry |
apasel422
commented
Jul 21, 2015
Contributor
@steveklabnik Can you replace 5a2bcd3 with e6d8434? |
alexcrichton
commented
Jul 21, 2015
Member
@bors: r- Unfortunately I think the test failure was legitimate. |
steveklabnik
commented
Jul 21, 2015
ContributorAuthor
closing, and I will fix up and make a new rollup soon |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.