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

Mir borrowck as query #44009

Merged
merged 3 commits into from
Aug 21, 2017
Merged

Mir borrowck as query #44009

merged 3 commits into from
Aug 21, 2017

Conversation

pnkfelix
Copy link
Member

Turn the mir-borrowck pass (aka "transform") into a query.

(If I had realized how relatively easy this was going to be, I would have made it part of #43108. let hindsight = 20/20;)

@rust-highfive
Copy link
Collaborator

r? @arielb1

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

@@ -923,6 +923,8 @@ define_maps! { <'tcx>
[] coherent_trait: coherent_trait_dep_node((CrateNum, DefId)) -> (),

[] borrowck: BorrowCheck(DefId) -> (),
// FIXME: shouldn't this return a `Result<(), BorrowckErrors>` instead?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll figure out the borrowck error story.

@arielb1
Copy link
Contributor

arielb1 commented Aug 21, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Aug 21, 2017

📌 Commit c9597ff has been approved by arielb1

@bors
Copy link
Contributor

bors commented Aug 21, 2017

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

@pnkfelix pnkfelix force-pushed the mir-borrowck-as-query branch from c9597ff to d92c953 Compare August 21, 2017 11:07
@pnkfelix
Copy link
Member Author

@bors r=arielb1

@bors
Copy link
Contributor

bors commented Aug 21, 2017

📌 Commit d92c953 has been approved by arielb1

@pnkfelix
Copy link
Member Author

@bors cancel

@pnkfelix pnkfelix force-pushed the mir-borrowck-as-query branch from d92c953 to 224c6ca Compare August 21, 2017 11:11
@pnkfelix
Copy link
Member Author

@bors r=arielb1

@bors
Copy link
Contributor

bors commented Aug 21, 2017

📌 Commit 224c6ca has been approved by arielb1

@bors
Copy link
Contributor

bors commented Aug 21, 2017

⌛ Testing commit 224c6ca with merge c326ad220ae5712937c8ee8085a074ebe1ff3fe0...

@bors
Copy link
Contributor

bors commented Aug 21, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Aug 21, 2017

@bors retry

Build canceled without any reason.

@bors
Copy link
Contributor

bors commented Aug 21, 2017

⌛ Testing commit 224c6ca with merge 4fdb4be...

bors added a commit that referenced this pull request Aug 21, 2017
Mir borrowck as query

Turn the `mir-borrowck` pass (aka "transform") into a query.

(If I had realized how relatively easy this was going to be, I would have made it part of #43108. `let hindsight = 20/20;`)
@bors
Copy link
Contributor

bors commented Aug 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing 4fdb4be to master...

@bors bors merged commit 224c6ca into rust-lang:master Aug 21, 2017
This was referenced Aug 21, 2017
bors added a commit that referenced this pull request Aug 22, 2017
Fix logic error in test guarding prototype MIR borrowck code.

Fix logic error in test guarding prototype MIR borrowck code.

tl;dr: 🤦

(This crept in during the shift from a transform to a query (#44009); I didn't notice because my muscle memory was still always passing `-Z mir-borrowck`, while my test cases *also* had the `#[rustc_mir_borrowck]` attribute attached to them.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants