Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more LocalDefIds #72299

Merged
merged 1 commit into from
May 30, 2020
Merged

more LocalDefIds #72299

merged 1 commit into from
May 30, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 17, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2020
@bors

This comment has been minimized.

Sign in to view
@lcnr
Copy link
Contributor Author

lcnr commented May 30, 2020

Rebased and ready for review

petrochenkov
petrochenkov reviewed May 30, 2020
View reviewed changes
src/librustc_middle/query/mod.rs Outdated Show resolved Hide resolved
src/librustc_middle/query/mod.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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 May 30, 2020
@petrochenkov
Copy link
Contributor

r? @petrochenkov

@lcnr
Copy link
Contributor Author

lcnr commented May 30, 2020

RFM I guess

@petrochenkov
Copy link
Contributor

r=me after squashing the commits

@lcnr
Copy link
Contributor Author

lcnr commented May 30, 2020

ok, done

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 30, 2020

📌 Commit 49b1b4c has been approved by petrochenkov

@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 May 30, 2020
@RalfJung RalfJung mentioned this pull request May 30, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2020
@bors
Auto merge of rust-lang#72778 - RalfJung:rollup-f01z68m, r=RalfJung
74e8046 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#72299 (more `LocalDefId`s)
 - rust-lang#72368 (Resolve overflow behavior for RangeFrom)
 - rust-lang#72441 (Fix ICE with explicit late-bound lifetimes)
 - rust-lang#72499 (Override Box::<[T]>::clone_from)
 - rust-lang#72521 (Properly handle InlineAsmOperand::SymFn when collecting monomorphized items)
 - rust-lang#72540 (mir: adjust conditional in recursion limit check)
 - rust-lang#72563 (multiple Return terminators are possible)
 - rust-lang#72585 (Only capture tokens for items with outer attributes)
 - rust-lang#72607 (Eagerly lower asm sub-expressions to HIR even if there is an error)

Failed merges:

r? @ghost
@bors bors merged commit 35db819 into rust-lang:master May 30, 2020
@lcnr lcnr deleted the sized_help branch May 30, 2020 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lcnr @rust-highfive @bors @petrochenkov @cramertj