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

Fix borrowck compiler errors for upvars contain "spurious" dereferences #46087

Merged
merged 1 commit into from
Nov 23, 2017

Conversation

vramana
Copy link
Contributor

@vramana vramana commented Nov 18, 2017

Fixes #46003

@vramana vramana force-pushed the fix-46003 branch 2 times, most recently from fe6b3bf to 9c9d094 Compare November 18, 2017 23:05
if autoderef {
self.append_lvalue_to_string(&proj.base, buf, Some(autoderef));
} else {
buf.push_str(&"(*");
Copy link
Contributor

Choose a reason for hiding this comment

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

It's a separate bug (#45185), but I'm pretty sure the () here are not necessary. That said, there is a fix for this in #46040 (which will obviously conflict with this PR).

@nikomatsakis
Copy link
Contributor

@bors r+

We'll let the paren thing sort itself out in rebasing. =)

@bors
Copy link
Contributor

bors commented Nov 19, 2017

📌 Commit 9c9d094 has been approved by nikomatsakis

@nikomatsakis nikomatsakis self-assigned this Nov 19, 2017
@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 19, 2017
@bors
Copy link
Contributor

bors commented Nov 22, 2017

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

@nikomatsakis
Copy link
Contributor

Needs rebase. =)

@vramana vramana force-pushed the fix-46003 branch 2 times, most recently from 4be9b35 to 5cf3e2e Compare November 23, 2017 08:50
@vramana
Copy link
Contributor Author

vramana commented Nov 23, 2017

@nikomatsakis Done.

@vramana
Copy link
Contributor Author

vramana commented Nov 23, 2017

@nikomatsakis Seems like an unrelated build failure.

@arielb1
Copy link
Contributor

arielb1 commented Nov 23, 2017

@vramana

You accidentally pushed a submodule update, please fix that

@arielb1
Copy link
Contributor

arielb1 commented Nov 23, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Nov 23, 2017

📌 Commit 392e513 has been approved by arielb1

@arielb1
Copy link
Contributor

arielb1 commented Nov 23, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Nov 23, 2017

📌 Commit d059b57 has been approved by arielb1

@bors
Copy link
Contributor

bors commented Nov 23, 2017

⌛ Testing commit d059b57 with merge 0916bbc...

bors added a commit that referenced this pull request Nov 23, 2017
Fix borrowck compiler errors for upvars contain "spurious" dereferences

Fixes #46003
@bors
Copy link
Contributor

bors commented Nov 23, 2017

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

@bors bors merged commit d059b57 into rust-lang:master Nov 23, 2017
@vramana vramana deleted the fix-46003 branch December 26, 2017 19:09
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

5 participants