Rollup of 4 pull requests #42445
Closed
Rollup of 4 pull requests #42445
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
Jun 5, 2017
Mark-Simulacrum
commented
- Successful merges: Print the two types in the span label for transmute errors. #42304, Remove 'elided' from lifetime resolution error #42415, rustc_llvm: re-run build script if config.toml changes #42429, doc rewording #42438
- Failed merges:
Removes 'elided' from lifetime resolution errors Removes 'elided' from relevant error messaging tests
Also moves a few transmute tests to UI tests to better test their output.
…matsakis Print the two types in the span label for transmute errors. Fixes rust-lang#37157. I'm not entirely happy with the changes here but overall it's better in my opinion; we certainly avoid the odd language in that issue, which changes to: ``` error[E0512]: transmute called with differently sized types: <C as TypeConstructor<'a>>::T (size can vary because of <C as TypeConstructor>::T) to <C as TypeConstructor<'b>>::T (size can vary because of <C as TypeConstructor>::T) --> test.rs:8:5 | 8 | ::std::mem::transmute(x) | ^^^^^^^^^^^^^^^^^^^^^ transmuting between <C as TypeConstructor<'a>>::T and <C as TypeConstructor<'b>>::T error: aborting due to previous error(s) ```
Remove 'elided' from lifetime resolution error Removes 'elided' from lifetime resolution errors Removes 'elided' from relevant error messaging tests This PR resolves rust-lang#29094 r? @Mark-Simulacrum
…hton rustc_llvm: re-run build script if config.toml changes closes rust-lang#35199
|
@bors r+ p=10 |
|
📌 Commit fd48c3a has been approved by |
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
|
💔 Test failed - status-travis |
|
My PR's fault, I think. Will investigate... |
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.