Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Nov 14, 2019

These are small post-#59953 cleanups (including undoing some contrivances from that PR).

r? @michaelwoerister

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2019
@bors
Copy link
Collaborator

bors commented Nov 20, 2019

☔ The latest upstream changes (presumably #66578) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister
Copy link
Member

Oh, it seems that I forgot about this. Maybe someone from @rust-lang/compiler-contributors wants to review?

@Mark-Simulacrum
Copy link
Member

r? @Mark-Simulacrum

I'll try to make a review happen here

@michaelwoerister
Copy link
Member

❤️

@Mark-Simulacrum
Copy link
Member

r=me presuming rebase isn't too big of a change

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2019
@eddyb eddyb force-pushed the rmeta-table-cleanup branch from 90dccda to a0556b3 Compare November 27, 2019 14:14
@eddyb
Copy link
Member Author

eddyb commented Nov 27, 2019

@bors r=Mark-Simulacrum Thanks! (the conflicts were all from git being coarse, AFAICT)

@bors
Copy link
Collaborator

bors commented Nov 27, 2019

📌 Commit a0556b3 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2019
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
@bors bors merged commit a0556b3 into rust-lang:master Nov 28, 2019
@eddyb eddyb deleted the rmeta-table-cleanup branch November 28, 2019 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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