[beta] Rollup backports #64438
Merged
[beta] Rollup backports #64438
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
See rust-lang#58794 for context.
This reverts commit b4a6f59.
Use it for feature-gating `#[bench]`
In rust-lang#60981 we switched to using src/llvm-project/compiler-rt inside compiler-builtins rather than a separate copy of it. In order to have the "c" feature turn on in builds from the source tarball, we need to include that path in its creation. fixes rust-lang#64239
|
@bors r+ p=1 Not bumping priority up by too much intentionally, since we still have two weeks, but we should make sure this lands "soon". |
|
📌 Commit e086278 has been approved by |
bors
added
the
S-waiting-on-bors
|
Thanks for doing the legwork here! |
|
⌛ Testing commit e086278 with merge 4ff1b1d61a2dfd36b354aa3cc8ebdc93f4da7dfb... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
It specifically failed in Linux x86_64-gnu-aux, but for some reason I can't get the logs. Maybe azure tripped up somehow? @bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 14, 2019
[beta] Rollup backports Cherry-picked: - Permit unwinding through FFI by default #62603 - pprust: Do not print spaces before some tokens #63897 - Account for doc comments coming from proc macros without spans #63930 - Support "soft" feature-gating using a lint #64066 - Update xLTO compatibility table in rustc book. #64092 - Include compiler-rt in the source tarball #64240 - Update LLVM submodule #64317 r? @Mark-Simulacrum
|
☀️ Test successful - checks-azure |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Cherry-picked:
r? @Mark-Simulacrum