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

Point at var in short lived borrows instead of drop location #46719

Merged
merged 2 commits into from
Dec 16, 2017

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Dec 14, 2017

For RLS' sake, point at the borrow location as primary span for short lived borrows, instead of the borrow drop location.

Fix #39268.

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 14, 2017
@estebank estebank force-pushed the issue-39268 branch 4 times, most recently from 9283c08 to 68ac119 Compare December 14, 2017 23:13
@michaelwoerister
Copy link
Member

r? @pnkfelix, who knows a lot more about borrow checking than me.

@arielb1
Copy link
Contributor

arielb1 commented Dec 14, 2017

This looks like a nice unification. I basically just cargo-culted the AST borrowck scheme when moving to MIR borrowck.

@pnkfelix
Copy link
Member

r=me once @estebank has addressed the travis failure

@bors
Copy link
Contributor

bors commented Dec 15, 2017

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

@estebank estebank force-pushed the issue-39268 branch 3 times, most recently from 9a5a6e7 to 22a8b3c Compare December 15, 2017 08:04
@estebank estebank 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 Dec 15, 2017
@estebank estebank force-pushed the issue-39268 branch 2 times, most recently from 3b6d97d to 2bdaf0c Compare December 15, 2017 20:31
@estebank
Copy link
Contributor Author

@bors r=pnkfelix

@bors
Copy link
Contributor

bors commented Dec 16, 2017

📌 Commit b562565 has been approved by pnkfelix

@estebank estebank 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 Dec 16, 2017
@bors
Copy link
Contributor

bors commented Dec 16, 2017

⌛ Testing commit b562565 with merge 00fbfcc...

bors added a commit that referenced this pull request Dec 16, 2017
Point at var in short lived borrows instead of drop location

For RLS' sake, point at the borrow location as primary span for short lived borrows, instead of the borrow drop location.

Fix #39268.
@bors
Copy link
Contributor

bors commented Dec 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 00fbfcc to master...

@bors bors merged commit b562565 into rust-lang:master Dec 16, 2017
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.

None yet

7 participants