Rollup of 5 pull requests #42049
Merged
Rollup of 5 pull requests #42049
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
Mark-Simulacrum
commented
May 16, 2017
Mark-Simulacrum
commented
- Successful merges: use equality in the coerce-unsized check #41937, Fix some clippy warnings in libsyntax #41957, avoid cycles in mir-dump, take 2 #42017, Update cargo submodule #42039, Update the various books to latest #42046
- Failed merges:
This is mostly removing stray ampersands, needless returns and lifetimes.
This seems both to be a safe, conservative choice, and it sidesteps the cycle in rust-lang#41936. Fixes rust-lang#41936.
This pulls in a fix for rust-lang#41797 to the master branch, I'll send a separate PR for the beta branch.
This includes a draft of chapter 20 of the book!
…oerce-unsized-cycle, r=eddyb use equality in the coerce-unsized check This seems both to be a safe, conservative choice, and it sidesteps the cycle in rust-lang#41849. Note that, before I converted variance into proper queries, we were using a hybrid of subtyping and equality, due to the presence of a flag that forced invariance if variance had not yet been computed. (Also, Coerce Unsized is unstable.) Fixes rust-lang#41936. r? @eddyb
…nkov Fix some clippy warnings in libsyntax This is mostly removing stray ampersands, needless returns and lifetimes. Basically a lot of small changes.
avoid cycles in mir-dump, take 2 This fixes rust-lang#41697, for real this time, but I'm not sure how best to add a regression test. I was considering maybe adding some flag so that the MIR dumping doesn't actually get written to files (e.g., overloading the directory flag so you can specify nil or something). cc @dwrensha @oli-obk
Update cargo submodule This pulls in a fix for rust-lang#41797 to the master branch, I'll send a separate PR for the beta branch. Note that the Cargo PR in question to pull in is rust-lang/cargo#4046
Update the various books to latest This includes a draft of chapter 20 of the book!
|
@bors r+ p=10 |
|
📌 Commit c3d22eb has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit c3d22eb with merge d8215fc... |
|
☀️ Test successful - status-appveyor, status-travis |
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.