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.

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

borrowck DefId -> LocalDefId #72103

Merged
merged 1 commit into from
May 30, 2020
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 11, 2020

Replaces some DefIds which must always be local with LocalDefId in librustc_mir/borrowck.

cc @marmeladema

@rust-highfive
Copy link
Collaborator

r? @estebank

(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 11, 2020
@joelpalmer joelpalmer added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 19, 2020
@lcnr
Copy link
Contributor Author

lcnr commented May 26, 2020

@estebank Do you have the time to review this or should I try and assign it to someone else?

@jonas-schievink
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 26, 2020

📌 Commit 3f661d2 has been approved by jonas-schievink

@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-review Status: Awaiting review from the assignee but also interested parties. labels May 26, 2020
@bors
Copy link
Contributor

bors commented May 27, 2020

⌛ Testing commit 3f661d2 with merge e6e710ff632645704628aaca2478ed6717408637...

@Dylan-DPC-zz
Copy link

@bors retry yield

@estebank
Copy link
Contributor

@lcnr was just about to review but @jonas-schievink got to it faster :)

@bors r? @jonas-schievink

RalfJung added a commit to RalfJung/rust that referenced this pull request May 29, 2020
…chievink

borrowck `DefId` -> `LocalDefId`

Replaces some `DefId`s which must always be local with `LocalDefId` in `librustc_mir/borrowck`.

cc @marmeladema
RalfJung added a commit to RalfJung/rust that referenced this pull request May 29, 2020
…chievink

borrowck `DefId` -> `LocalDefId`

Replaces some `DefId`s which must always be local with `LocalDefId` in `librustc_mir/borrowck`.

cc @marmeladema
RalfJung added a commit to RalfJung/rust that referenced this pull request May 29, 2020
…chievink

borrowck `DefId` -> `LocalDefId`

Replaces some `DefId`s which must always be local with `LocalDefId` in `librustc_mir/borrowck`.

cc @marmeladema
RalfJung added a commit to RalfJung/rust that referenced this pull request May 29, 2020
…chievink

borrowck `DefId` -> `LocalDefId`

Replaces some `DefId`s which must always be local with `LocalDefId` in `librustc_mir/borrowck`.

cc @marmeladema
bors added a commit to rust-lang-ci/rust that referenced this pull request May 29, 2020
Rollup of 9 pull requests

Successful merges:

 - rust-lang#67460 (Tweak impl signature mismatch errors involving `RegionKind::ReVar` lifetimes)
 - rust-lang#71095 (impl From<[T; N]> for Box<[T]>)
 - rust-lang#71500 (Make pointer offset methods/intrinsics const)
 - rust-lang#71804 (linker: Support `-static-pie` and `-static -shared`)
 - rust-lang#71862 (Implement RFC 2585: unsafe blocks in unsafe fn)
 - rust-lang#72103 (borrowck `DefId` -> `LocalDefId`)
 - rust-lang#72407 (Various minor improvements to Ipv6Addr::Display)
 - rust-lang#72413 (impl Step for char (make Range*<char> iterable))
 - rust-lang#72439 (NVPTX support for new asm!)

Failed merges:

r? @ghost
@bors bors merged commit e229d6e into rust-lang:master May 30, 2020
@lcnr lcnr deleted the borrowck-localdefid branch May 30, 2020 06:25
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.

7 participants