rustc_metadata: simplify the interactions between Lazy and Table.#66399
Merged
bors merged 4 commits intorust-lang:masterfrom Nov 28, 2019
Merged
rustc_metadata: simplify the interactions between Lazy and Table.#66399bors merged 4 commits intorust-lang:masterfrom
bors merged 4 commits intorust-lang:masterfrom
Conversation
Collaborator
|
☔ The latest upstream changes (presumably #66578) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
Oh, it seems that I forgot about this. Maybe someone from @rust-lang/compiler-contributors wants to review? |
Member
|
I'll try to make a review happen here |
Member
|
❤️ |
Member
|
r=me presuming rebase isn't too big of a change |
90dccda to
a0556b3
Compare
Member
Author
|
@bors r=Mark-Simulacrum Thanks! (the conflicts were all from git being coarse, AFAICT) |
Collaborator
|
📌 Commit a0556b3 has been approved by |
tmandry
added a commit
to tmandry/rust
that referenced
this pull request
Nov 27, 2019
…imulacrum rustc_metadata: simplify the interactions between Lazy and Table. These are small post-rust-lang#59953 cleanups (including undoing some contrivances from that PR). r? @michaelwoerister
bors
added a commit
that referenced
this pull request
Nov 27, 2019
Rollup of 17 pull requests Successful merges: - #64325 (Stabilize nested self receivers in 1.41.0) - #66222 (Use `eq_opaque_type_and_type` when type-checking closure signatures) - #66305 (Add by-value arrays to `improper_ctypes` lint) - #66399 (rustc_metadata: simplify the interactions between Lazy and Table.) - #66534 (Allow global references via ForeignItem and Item for the same symbol name during LLVM codegen) - #66700 (Fix pointing at arg for fulfillment errors in function calls) - #66704 (Intra doc enum variant field) - #66718 (Refactor `parse_enum_item` to use `parse_delim_comma_seq`) - #66722 (Handle non_exhaustive in borrow checking) - #66744 (Fix shrink_to panic documentation) - #66761 (Use LLVMDisposePassManager instead of raw delete in rustllvm) - #66769 (Add core::{f32,f64}::consts::TAU.) - #66774 (Clean up error codes) - #66777 (Put back tidy check on error codes) - #66797 (Fixes small typo in array docs r? @steveklabnik) - #66798 (Fix spelling typos) - #66800 (Combine similar tests for const match) 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.
These are small post-#59953 cleanups (including undoing some contrivances from that PR).
r? @michaelwoerister