Rollup of 7 pull requests #33833
Merged
Rollup of 7 pull requests #33833
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
GuillaumeGomez
commented
May 24, 2016
GuillaumeGomez
commented
- Successful merges: Improve the long explanation of E0207. #33692, Fix references links #33759, Update repr_simd #33779, Add new error code tests #33781, Fixed expand/collapse shortcut to not conflict with browser shortcuts #33797, Fixed link in Rust Book (no-stdlib) #33810, std: Use memalign, not posix_memalign, on Android #33832
- Failed merges:
There are Duplicate link references in the article and the format is incorrect.
Allows both `T` and `t`. It had been [Shift]+[+] before.
Realized browsers use [Ctrl]+[+=] for zoom, so using [Shift]+[+=] for collapse/expand was not necessarily a conflict. Also a bugfix.
Fix a broken link in the rust book.
The previous explanation does not seem to explain what it means for an implementation parameter to be used or unused. The new explanation lists the three ways specific ways by which an impl parameter becomes constrained (taken from RFC 447). This also adds a link to RFC 447. The explanation has two different examples. The first is adapted from RFC 447, and shows an instance of E0207 on a impl for a type. The second one is a trait impl example adapted from issue rust-lang#22834. Closes rust-lang#33650
|
r? @jroesch (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit a0fc9cc has been approved by |
|
⌛ Testing commit a0fc9cc with merge 338ddd7... |
|
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
Improve the long explanation of E0207. The previous explanation does not seem to explain what it means for an implementation parameter to be used or unused. The new explanation lists the three ways specific ways by which an impl parameter becomes constrained (taken from RFC 447). This also adds a link to RFC 447. The explanation has two different examples. The first is adapted from RFC 447, and shows an instance of E0207 on a impl for a type. The second one is a trait impl example adapted from issue rust-lang#22834. Closes rust-lang#33650 cc rust-lang#32777 r? @GuillaumeGomez
Fix references links There are duplicate link references in the article and just remove one of them.
…abnik Update repr_simd r? @steveklabnik
…abnik Add new error code tests r? @steveklabnik
Changed toggle all sections key to `T` Allows both `T` and `t`. It had been [Shift]+[+] before. In response to rust-lang#33791. cc @Manishearth r? @GuillaumeGomez
Fixed link in Rust Book (no-stdlib) Closes rust-lang#33806
|
@bors: r+ p=1 |
|
📌 Commit 4613835 has been approved by |
|
⌛ Testing commit 4613835 with merge 49719a6... |
|
💔 Test failed - auto-win-msvc-64-opt |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
May 24, 2016
|
💔 Test failed - auto-win-gnu-64-opt |
|
@bors: retry |
Merged
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.