Move DelaySpanBugEmitted to ty::context#74399
Merged
bors merged 1 commit intorust-lang:masterfrom Aug 16, 2020
Merged
Conversation
Collaborator
|
☔ The latest upstream changes (presumably #73990) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
Ping @eddyb. I think this should be a relatively easy PR to review. |
Collaborator
|
☔ The latest upstream changes (presumably #73851) made this pull request unmergeable. Please resolve the merge conflicts. |
eddyb
approved these changes
Aug 16, 2020
Member
eddyb
left a comment
There was a problem hiding this comment.
r=me, please PM on Zulip if I lose track of PRs
eddyb
reviewed
Aug 16, 2020
eddyb
approved these changes
Aug 16, 2020
Member
|
@bors r+ |
Collaborator
|
📌 Commit e1cd185 has been approved by |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Aug 16, 2020
Move DelaySpanBugEmitted to ty::context This makes it even hard to abuse. r? @eddyb cc @LeSeulArtichaut as this will probably conflict with your PR :/
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 16, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#74204 (Don't visit foreign function bodies when lowering ast to hir) - rust-lang#74314 (rustc_typeck: construct {Closure,Generator}Substs more directly.) - rust-lang#74346 (Use LocalDefId instead of HirId for reachable_set elements.) - rust-lang#74399 (Move DelaySpanBugEmitted to ty::context) - rust-lang#75177 (Add regression test for issue-66768) - rust-lang#75223 (Add #[track_caller] to `Session::delay_span_bug`) - rust-lang#75423 (Move to intra-doc links for /library/core/src/hint.rs) - rust-lang#75485 (pin docs: add some forward references) - rust-lang#75569 (Bump minor version of emsdk to 1.38.47) - rust-lang#75596 (Switch to intra-doc links in /sys/windows/ext/{ffi,fs,process}.rs) Failed merges: r? @ghost
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
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 makes it even hard to abuse.
r? @eddyb
cc @LeSeulArtichaut as this will probably conflict with your PR :/