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

Cleanup borrowck errors #62629

Merged
merged 5 commits into from
Jul 15, 2019
Merged

Conversation

matthewjasper
Copy link
Contributor

@matthewjasper matthewjasper commented Jul 12, 2019

This removes some of the unnecessary code that allowed sharing error reporting between two borrow checkers.

closes #59193

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 Jul 12, 2019
@bors
Copy link
Contributor

bors commented Jul 13, 2019

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

@petrochenkov
Copy link
Contributor

r=me after rebase

@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 Jul 14, 2019
Its methods are now inherent methods of `MirBorrowckCtxt`
The borrow checker code is already using `crate` extensively, so prefer
being consistent with it.
@matthewjasper
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jul 15, 2019

📌 Commit 9709b73 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 Jul 15, 2019
@bors
Copy link
Contributor

bors commented Jul 15, 2019

⌛ Testing commit 9709b73 with merge 5480b47...

bors added a commit that referenced this pull request Jul 15, 2019
…chenkov

Cleanup borrowck errors

This removes some of the unnecessary code that allowed sharing error reporting between two borrow checkers.

closes #59193
@bors
Copy link
Contributor

bors commented Jul 15, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: petrochenkov
Pushing 5480b47 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 15, 2019
@bryanburgers-bot
Copy link

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors merged commit 9709b73 into rust-lang:master Jul 15, 2019
@matthewjasper matthewjasper deleted the cleanup-borrowck-errors branch July 15, 2019 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

Remove -Zborrowck=compare
6 participants