Rollup of 7 pull requests #29883
Merged
Rollup of 7 pull requests #29883
Conversation
This file contains hidden or 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
Nov 17, 2015
Manishearth
commented
- Successful merges: Do not generate comparefoo.gv and simpleeq.gv during testing #29868, Improve UFCS example #29873, Make note about traits that can be derived #29874, Remove nomicon reference to copy_lifetime #29875, mk/platform: support i486 and i586 target CHOST #29876, Fix libc module name for FreeBSD #29880, Fix grammar #29881
- Failed merges:
On distros that use i486 or i586 in their CHOST, Rust will fail to build because it is not handling i486 or i586 like i686 is handled. This changes the match to do work for all instances of i?86 instead of just i686. The Yocto Project still uses i586 as a target. Signed-off-by: Doug Goldstein <[email protected]>
in their API docs Fixes rust-lang#29711
Change conditional perfect to past perfect.
in their API docs Fixes rust-lang#29711
On distros that use i486 or i586 in their CHOST, Rust will fail to build because it is not handling i486 or i586 like i686 is handled. This changes the match to do work for all instances of i?86 instead of just i686. The Yocto Project still uses i586 as a target. Signed-off-by: Doug Goldstein <[email protected]>
…chton With this change the build on FreeBSD is almost working again.
Change conditional perfect to past perfect.
|
r? @Manishearth (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 force |
|
📌 Commit e81c72e has been approved by |
bors
added a commit
that referenced
this pull request
Nov 17, 2015
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.