Skip to content

Rollup of 12 pull requests - #36227

Merged
bors merged 25 commits into
rust-lang:masterfrom
sophiajt:rollup
Sep 3, 2016
Merged

Rollup of 12 pull requests#36227
bors merged 25 commits into
rust-lang:masterfrom
sophiajt:rollup

Conversation

QuietMisdreavusand others added 25 commits August 17, 2016 14:32
Previously we didn't normalize the function signatures used for
closures. This didn't cause a problem in most cases, but caused an ICE
in during MIR type checking.
Fixesrust-lang#36139
Currently it checks only the first argument.
Fixesrust-lang#31216
We've got tests which require a particular version of LLVM to run as they're
testing bug fixes. Our build system, however, supports multiple LLVM versions,
so we can't run these tests on all LLVM versions.
This adds a new `min-llvm-version` directive for tests so they can opt out of
being run on older versions of LLVM. This then namely applies that logic to the
`issue-36023.rs` test case and...
Closesrust-lang#36138
… r=Manishearth
Add `must_use` to the Reference
I'm a bit uncertain about the exact phrasing, but having it mentioned at all is probably better than before.
…teveklabnik
demonstrate `RHS != Self` use cases for `Add` and `Sub`
…teveklabnik
Document try!'s error conversion behaviour
try!'s documentation currently doesn't document the error conversion behaviour of the macro. This patch extends the documentation.
Open questions:
* is it worthwhile to have seperate examples with and without wrapping behaviour? It's not immediately obvious that From<T> for T is always defined. Though this is necessary for the macro to work in any case, is this the place to expect that knowledge.
Normalize the function signature of closures
Previously we didn't normalize the function signatures used for
closures. This didn't cause a problem in most cases, but caused an ICE
in during MIR type checking.
Fixesrust-lang#36139
r? @eddyb
…nikomatsakis
Update lifetime errors to specifically note temporaries
This PR updates the error message we give in the case of a temporary value not living long enough.
Before:
<img width="497" alt="screen shot 2016-08-31 at 10 02 47 am" src="https://cloud.githubusercontent.com/assets/547158/18138551/27a06794-6f62-11e6-9ee2-bdf8bed75ca7.png">
Now:
<img width="488" alt="screen shot 2016-08-31 at 10 03 01 am" src="https://cloud.githubusercontent.com/assets/547158/18138557/2e5cf322-6f62-11e6-9047-4a78abf3d78c.png">
Specifically, it makes the following changes:
* Detects if a temporary is being used. If so, it changes the labels to mention that a temporary value specifically is in question
* Simplifies wording of the existing labels to focus on lifetimes rather than values being valid
* Changes the help to a note, since the help+span wasn't as helpful (and sometimes more confusing) than just a note.
r? @nikomatsakis
…ikomatsakis
Special case a few colors for Windows
As brought up on [this thread](rust-lang#33240 (comment)) the colors used in error messages on Windows can be difficult to read because of the lack of bold.
This PR makes a few changes to improve readability, namely:
* Rather than using BRIGHT_BLUE, on Windows we now use BRIGHT_CYAN, which is easier to read on black when you do not have bold
* We used BRIGHT_YELLOW rather than YELLOW, for the same reason
* Titles will be BRIGHT_WHITE now, to give the illusion of being bold
Some examples:
![warning](https://cloud.githubusercontent.com/assets/547158/18148466/9aa9bbe2-6f8e-11e6-927f-d0eec53cac32.PNG)
![error](https://cloud.githubusercontent.com/assets/547158/18148488/ba9fb186-6f8e-11e6-8d8e-e93d569f61de.PNG)
r? @nikomatsakis
cc @retep998
configure: check if any of the arguments contain --help
Currently it checks only the first argument.
Fixesrust-lang#31216
test: Add a min-llvm-version directive
We've got tests which require a particular version of LLVM to run as they're
testing bug fixes. Our build system, however, supports multiple LLVM versions,
so we can't run these tests on all LLVM versions.
This adds a new `min-llvm-version` directive for tests so they can opt out of
being run on older versions of LLVM. This then namely applies that logic to the
`issue-36023.rs` test case and...
Closesrust-lang#36138
…rner
Fixed E0529's label and unit test
Fixesrust-lang#36195 part of rust-lang#35233.
This is ready for review, but will likely fail Travis due to rust-lang#36138. I changed the wording of the label, so feedback on that would be appreciated.
r? @jonathandturner
…andturner
Update compiler error E0558 to use new error format
Fixesrust-lang#36196 part of rust-lang#35233
r? @jonathandturner
@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Aatch

(rust_highfive has picked a reviewer for you, use r? to override)

@bors

bors commented Sep 2, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit c701490 has been approved by jonathandturner

@bors

bors commented Sep 3, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c701490 with merge 100b309...

bors added a commit that referenced this pull request Sep 3, 2016
@bors
bors merged commit c701490 into rust-lang:masterSep 3, 2016
@borsbors mentioned this pull request Sep 3, 2016
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@sophiajt@rust-highfive@bors@Aatch@Centril@matthew-piziak@0xmohit@skade@alexcrichton@frewsxcv@abhiQmar