Rollup of 8 pull requests #33494
Merged
Rollup of 8 pull requests #33494
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
Manishearth
commented
May 8, 2016
Manishearth
commented
- Successful merges: degrade gracefully with empty spans #33369, rustdoc: use btree map for where clauses #33373, Cargo lock tidy check #33404, Improve diagnostics for constants being used in irrefutable patterns #33406, implement RFC 1521 #33420, make dist: specify the archive file as stdout #33424, Implement RFC 1542 #33426, Preparatory refactorings for collector-driven trans. #33473
- Failed merges:
to get more reproducible output. Fixes: rust-lang#32555
It's pretty confusing and this error triggers in resolve only when "shadowing" a const, so let's make that clearer.
Adds documentation to Clone, specifying that Copy types should have a trivial Clone impl. Fixes rust-lang#33416.
If the `-f` option isn't given, GNU tar will use environment variable `TAPE` first, and next use the compiled-in default, which isn't necessary `stdout` (it is the tape device `/dev/rst0` under OpenBSD for example).
|
r? @jroesch (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=20 |
|
📌 Commit cd9efdf has been approved by |
bors
added a commit
that referenced
this pull request
May 8, 2016
|
💔 Test failed - auto-linux-64-opt-rustbuild |
|
@bors r+ |
|
📌 Commit 336ea2c has been approved by |
|
🔒 Merge conflict |
…=jntrnr degrade gracefully with empty spans In rust-lang#32756, we solved the final test failure, but digging more into it the handling of that scenario could be better. The error was caused by an empty span supplied by the parser representing EOF. This patch checks that we cope more gracefully with such spans: r? @jonathandturner
rustdoc: use btree map for where clauses to get more reproducible output. Fixes: rust-lang#32555 I've looked at the other uses of HashMap in rustdoc, and they seem ok to (i.e. they use `iter()` and related only for constructing a new map, or when the output goes into independent files). Not sure what the cause of rust-lang#24473 is, it shouldn't be where clauses, but maybe it was also fixed inbetween since May 2015.
Cargo lock tidy check A rebased PR for rust-lang#32901
… r=GuillaumeGomez Improve diagnostics for constants being used in irrefutable patterns It's pretty confusing and this error triggers in resolve only when "shadowing" a const, so let's make that clearer. r? @steveklabnik
implement RFC 1521 Adds documentation to Clone, specifying that Copy types should have a trivial Clone impl. Fixes rust-lang#33416. I tried to use "should" and "must" as defined [here](https://tools.ietf.org/html/rfc2119). cc @ubsan
make dist: specify the archive file as stdout If the `-f` option isn't given, GNU tar will use environment variable `TAPE` first, and next use the compiled-in default, which isn't necessary `stdout` (it is the tape device `/dev/rst0` under OpenBSD for example).
Implement RFC 1542 cc rust-lang#33417 r? @aturon
|
@bors r+ force |
|
📌 Commit cc98f4c has been approved by |
bors
added a commit
that referenced
this pull request
May 8, 2016
This was referenced May 8, 2016
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.