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

Add a MIR-borrowck-only output mode #46106

Merged
merged 3 commits into from
Nov 26, 2017
Merged

Add a MIR-borrowck-only output mode #46106

merged 3 commits into from
Nov 26, 2017

Conversation

est31
Copy link
Member

@est31 est31 commented Nov 19, 2017

Removes the -Z borrowck-mir flag in favour of a -Z borrowck=mode flag where mode can be mir, ast, or compare.

  • The ast mode represents the current default, passing -Z borrowck=ast is equivalent to not passing it at all.
  • The compare mode outputs both the output of the MIR borrow checker and the AST borrow checker, each error with (Ast) and (Mir) appended. This mode has the same behaviour as -Z borrowck-mir had before this commit.
  • The mir mode only outputs the results of the MIR borrow checker, while suppressing the errors of the ast borrow checker

The PR also updates the tests to use the new flags.

closes #46097

@est31 est31 changed the title Enable MIR-borrowck-only output Add a MIR-borrowck-only output mode Nov 19, 2017
@est31
Copy link
Member Author

est31 commented Nov 19, 2017

r? @nikomatsakis or someone else

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2017
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

Thanks, @est31!

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 20, 2017

📌 Commit 59780fe has been approved by nikomatsakis

@kennytm kennytm 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 Nov 21, 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, I'm afraid.

@est31
Copy link
Member Author

est31 commented Nov 22, 2017

The PR touches every single MIR borrowck test... it is expectable that there is a little breakage :). This probably won't be the last time I'll have to do a rebase but I don't mind that.

The PR should be rebased again re-r? @nikomatsakis

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2017

📌 Commit 291ac56 has been approved by nikomatsakis

@arielb1
Copy link
Contributor

arielb1 commented Nov 22, 2017

@bors p=1

@arielb1
Copy link
Contributor

arielb1 commented Nov 22, 2017

umm I want #46100 to land first
@bors p=0

@nikomatsakis
Copy link
Contributor

Heh, I almost did the same thing (p=1) but then reconsidered for the same reason.

@bors
Copy link
Contributor

bors commented Nov 23, 2017

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

@est31
Copy link
Member Author

est31 commented Nov 23, 2017

re-r? @nikomatsakis

where mode is one of {ast,mir,compare}.

This commit only implements the functionality.
The tests will be updated in a follow up commit.
@arielb1
Copy link
Contributor

arielb1 commented Nov 26, 2017

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Nov 26, 2017

📌 Commit d791798 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Nov 26, 2017

⌛ Testing commit d791798 with merge 827cb0d...

bors added a commit that referenced this pull request Nov 26, 2017
Add a MIR-borrowck-only output mode

Removes the `-Z borrowck-mir` flag in favour of a `-Z borrowck=mode` flag where mode can be `mir`, `ast`, or `compare`.

* The `ast` mode represents the current default, passing `-Z borrowck=ast` is equivalent to not passing it at all.
* The `compare` mode outputs both the output of the MIR borrow checker and the AST borrow checker, each error with `(Ast)` and `(Mir)` appended. This mode has the same behaviour as `-Z borrowck-mir` had before this commit.
* The `mir` mode only outputs the results of the MIR borrow checker, while suppressing the errors of the ast borrow checker

The PR also updates the tests to use the new flags.

closes  #46097
@bors
Copy link
Contributor

bors commented Nov 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 827cb0d to master...

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.

Enable MIR-borrowck-only output
5 participants