Rollup of 5 pull requests #62485
Merged
Rollup of 5 pull requests #62485
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
This increases consistency with other common data structures.
This was removed in 8a7dded, but since rust-lang#62286 hasn't yet made it into beta, this is breaking the build with llvm-libunwind feature enabled. Furthemore, restrict the link attribute to Fuchsia and Linux, matching the logic in build.rs since llvm-libunwind feature isn't yet supported on other systems.
Implement Option::contains and Result::contains This increases consistency with other common data structures.
Document `while` keyword This is a rework of rust-lang#60761. Closes rust-lang#60736 r? @dtolnay
…_compiler_messages_p2, r=Centril Normalize use of backticks in compiler messages p2 normalize use of backticks in compiler messages for librustc_typecheck rust-lang#60532
Re-add bootstrap attribute to libunwind for llvm-libunwind feature This was removed in 8a7dded, but since rust-lang#62286 hasn't yet made it into beta, this is breaking the build with llvm-libunwind feature enabled. Furthemore, restrict the link attribute to Fuchsia and Linux, matching the logic in build.rs since llvm-libunwind feature isn't yet supported on other systems.
…_compiler_messages_p3, r=Centril normalize use of backticks for compiler messages in librustc_codegen rust-lang#60532
|
@bors r+ p=5 rollup=never |
|
📌 Commit ada2684 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 8, 2019
Rollup of 5 pull requests Successful merges: - #62356 (Implement Option::contains and Result::contains) - #62462 (Document `while` keyword) - #62472 (Normalize use of backticks in compiler messages p2) - #62477 (Re-add bootstrap attribute to libunwind for llvm-libunwind feature) - #62478 (normalize use of backticks for compiler messages in librustc_codegen) Failed merges: r? @ghost
|
☀️ Test successful - checks-azure, checks-travis, status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Successful merges:
whilekeyword #62462 (Documentwhilekeyword)Failed merges:
r? @ghost