Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #62485

Merged
merged 10 commits into from
Jul 8, 2019
Merged

Rollup of 5 pull requests #62485

merged 10 commits into from
Jul 8, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 8, 2019

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 10 commits July 7, 2019 22:17
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.
…_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
@Centril
Copy link
Contributor Author

Centril commented Jul 8, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jul 8, 2019

📌 Commit ada2684 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 8, 2019
@bors
Copy link
Contributor

bors commented Jul 8, 2019

⌛ Testing commit ada2684 with merge db592f4...

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
@bors
Copy link
Contributor

bors commented Jul 8, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Centril
Pushing db592f4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 8, 2019
@bors bors merged commit ada2684 into rust-lang:master Jul 8, 2019
@Centril Centril deleted the rollup-gg3it1u branch July 8, 2019 11:17
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants