Rollup of 20 pull requests #27216
Closed
Rollup of 20 pull requests #27216
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
Jul 22, 2015
steveklabnik
commented
- Successful merges: Error message for E0307 is weird #26485 #26778, Add E0403, E0404, E0405, E0407, E0428 and E0433 error explanation #27084, 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, Improve documentation for std::io::BufWriter #27155, Fix wording nit for E0253 #27156, Document iterators in std::io #27157, add test for #14382 #27158, Document structures in std::io::utils #27164, Improve documentation for std::io::LineWriter #27166, Update docs for take and broadcast #27167, Expand documentation for IntoInnerError #27170, Add travis config to TRPL: release channels #27175, Trivial changes in the Rust book. #27201, update compile-fail test for #21174 to account for #27127 #27202
- 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. Closes rust-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.
This should help people configure travis to test all three channels.
Mostly adding examples.
…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. Closes rust-lang#26468
I'm pretty sure this was a typo
… r=alexcrichton Mostly through adding examples. r? @alexcrichton I'm going to be doing a bunch of these today, but I figured I'd keep it one PR per struct, since the last 'all the things in one PR' ended up taking a week to actually land.
…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
… r=alexcrichton Beef up the struct docs, add examples for the methods. r? @alexcrichton
…xcrichton Better and more consistent links to their creators.
…ror, r=alexcrichton Mostly adding examples. r? @alexcrichton
…r=alexcrichton This should help people configure travis to test all three channels.
Just some small changes.
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
okay, triple checked all my things |
|
@bors: r+ p=10000000000000000000 |
|
📌 Commit 12e17ad has been approved by |
|
🔒 Merge conflict |
|
☔ The latest upstream changes (presumably #26683) made this pull request unmergeable. Please resolve the merge conflicts. |
|
fffuuuuu |
# 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.