Add a convenience method on TyCtxt for checking for thread locals#71465
Merged
bors merged 5 commits intorust-lang:masterfrom May 1, 2020
Merged
Add a convenience method on TyCtxt for checking for thread locals#71465bors merged 5 commits intorust-lang:masterfrom
TyCtxt for checking for thread locals#71465bors merged 5 commits intorust-lang:masterfrom
Conversation
Contributor
Author
|
hmm, bors doesn't like bjorn github reviewer suggestions say |
Member
|
oli-obk
force-pushed
the
is_thread_local_cleanup
branch
from
aa91776 to
c3d17e6
Compare
Contributor
|
Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
RalfJung
reviewed
Apr 29, 2020
Member
There was a problem hiding this comment.
Please leave an empty line above and below, otherwise this "melds" into the following doc-comment.
Also while you are at it, could you fix the doc-comment for the enum itself?
Contributor
Author
There was a problem hiding this comment.
Rustfmt eats that line. I did have that line ;)
Contributor
Author
There was a problem hiding this comment.
do you want me to rustfmt skip the enum?
Member
There was a problem hiding this comment.
Seriously, rustfmt is getting annoying. :/
Maybe then format it like that:
//
// text
//
or does rustfmt also remove empty comments?
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
RalfJung
reviewed
Apr 30, 2020
Comment on lines
444
to
445
oli-obk
force-pushed
the
is_thread_local_cleanup
branch
from
357f634 to
8079dd8
Compare
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 8079dd8 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 30, 2020
Rollup of 8 pull requests Successful merges: - rust-lang#71148 (Vec drop and truncate: drop using raw slice *mut [T]) - rust-lang#71465 (Add a convenience method on `TyCtxt` for checking for thread locals) - rust-lang#71567 (Handle build completion message from Cargo) - rust-lang#71590 (MIR dump: print pointers consistently with Miri output) - rust-lang#71682 (Bump pulldown-cmark) - rust-lang#71688 (Allow `Downcast` projections unconditionally in const-checking) - rust-lang#71691 (Allow `Unreachable` terminators unconditionally in const-checking) - rust-lang#71719 (Update backtrace-sys) Failed merges: r? @ghost
Collaborator
|
☔ The latest upstream changes (presumably #71721) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
This PR extracts the cleanup part of #71192
r? @bjorn3