Skip to content

Add a MIR-borrowck-only output mode - #46106

Merged
bors merged 3 commits into
rust-lang:masterfrom
est31:master
Nov 26, 2017
Merged

Add a MIR-borrowck-only output mode#46106
bors merged 3 commits into
rust-lang:masterfrom
est31:master

Conversation

@est31

@est31est31 commented Nov 19, 2017

Copy link
Copy Markdown
Member

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

@est31est31 changed the title Enable MIR-borrowck-only outputAdd a MIR-borrowck-only output modeNov 19, 2017
@est31

est31 commented Nov 19, 2017

Copy link
Copy Markdown
MemberAuthor

r? @nikomatsakis or someone else

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2017
nikomatsakis
nikomatsakis approved these changes Nov 20, 2017
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, @est31!

@nikomatsakis

nikomatsakis commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 20, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 59780fe has been approved by nikomatsakis

@kennytmkennytm 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

bors commented Nov 22, 2017

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

nikomatsakis commented Nov 22, 2017

Copy link
Copy Markdown
Contributor

Needs rebase, I'm afraid.

@est31

est31 commented Nov 22, 2017

Copy link
Copy Markdown
MemberAuthor

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

nikomatsakis commented Nov 22, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 22, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 291ac56 has been approved by nikomatsakis

@arielb1

arielb1 commented Nov 22, 2017

Copy link
Copy Markdown
Contributor

@bors p=1

@arielb1

arielb1 commented Nov 22, 2017

Copy link
Copy Markdown
Contributor

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

@nikomatsakis

nikomatsakis commented Nov 22, 2017

Copy link
Copy Markdown
Contributor

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

@bors

bors commented Nov 23, 2017

Copy link
Copy Markdown
Collaborator

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

@est31

est31 commented Nov 23, 2017

Copy link
Copy Markdown
MemberAuthor

re-r? @nikomatsakis

@est31est31 mentioned this pull request Nov 25, 2017
Merged
@est31
Replace -Zborrowck-mir with -Zborrowck=mode
c9af68e
where mode is one of {ast,mir,compare}.
This commit only implements the functionality.
The tests will be updated in a follow up commit.
@est31
Update tests for -Zborrowck-mir -> -Zborrowck=mode migration
755fa9c
@arielb1

arielb1 commented Nov 26, 2017

Copy link
Copy Markdown
Contributor

@bors r=nikomatsakis

@bors

bors commented Nov 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit d791798 has been approved by nikomatsakis

@bors

bors commented Nov 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d791798 with merge 827cb0d...

bors added a commit that referenced this pull request Nov 26, 2017
@bors
Auto merge of#46106- est31:master, r=nikomatsakis
827cb0d
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

bors commented Nov 26, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit d791798 into rust-lang:masterNov 26, 2017
This was referenced Nov 26, 2017
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Enable MIR-borrowck-only output

5 participants

@est31@nikomatsakis@bors@arielb1@kennytm