NLL: change compare-mode=nll to use borrowck=migrate #55134

davidtwco · 2018-10-16T23:03:49Z

This PR is split into two parts:

The first commit is a minor change that fixes a flaw in the existing borrowck=migrate implementation whereby a lint that was promoted to an error in the AST borrow checker would result in the same lint from the NLL borrow checker being downgraded to a warning in migrate mode. This PR fixes this by ensuring lints are exempt from buffering in the NLL borrow checker.

The second commit updates compiletest to make the NLL compare mode use -Z borrowck=migrate rather than -Z borrowck=mir. The third commit shows all the test output changes that result from this.

r? @pnkfelix

When lints are emitted from the AST borrow checker, they do not signal an error as it is not known at that time whether, due to attributes, that lint will error or warn. This means that when lints are buffered in the MIR they will always be downgraded, as the AST borrowck will not have been marked as having errored, even if a lint was upgraded to an error after being emitted from the AST borrowck. The simple solution to this is to not buffer any lints from the MIR borrowck.

This commit changes the NLL compare mode to pass `-Z borrowck=migrate` rather than `-Z borrowck=nll` to better test what will be deployed. It does not include the test output updates, as separation of these commits makes reviewing simpler.

This commit updates the test output for the updated NLL compare mode that uses `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The previous commit changes `compiletest` and this commit only updates `.nll.stderr` files.

davidtwco · 2018-10-16T23:21:47Z

At request of @pnkfelix, the first commit has a separate PR (#55135) so that if this PR needs a lot of rebases, it doesn't slow that fix down.

pnkfelix · 2018-10-17T00:49:30Z

This PR looks fine as it stands. I didn't read over everything in commit 539404b, but I did some spot checking of the changes in output.

However, there is some debate about whether this PR should land before or after we do the third and final round of .stderr review (issue #54528) ... so I'm delaying slightly on r+'ing this until after we've resolved that Question.

pnkfelix · 2018-10-17T13:24:22Z

From @nikomatsakis:

The options:

land the change to migrate mode and do a comparison of migrate/ast output

do a comparison of nll/ast output and then land change to migrate mode?

I see pros/cons to both, but it seems to me that, schedule wise, it is most urgent to ensure migration "seems good", and we can revisit NLL "at our leisure".

To that end, there is a third-way add the NLL compare mode but do not run it on the builders. You can then run it manually to generate the comparison files for the purposes of comparison.

That makes sense to me. So I say, we land this now. And we can figure out what to do for #54528 after it lands.

pnkfelix · 2018-10-17T13:24:36Z

@bors r+ p=1

bors · 2018-10-17T13:24:37Z

📌 Commit 539404b has been approved by pnkfelix

pnkfelix · 2018-10-17T14:09:01Z

(i gave this priority=1 because I'm concerned about the .stderr files going stale quickly.)

bors · 2018-10-17T14:38:35Z

⌛ Testing commit 539404b with merge 4e9f799bfd25b1c80cb5c0db608056eb0425f7e9...

bors · 2018-10-17T16:28:07Z

💔 Test failed - status-travis

davidtwco · 2018-10-17T18:53:20Z

@bors retry

bors · 2018-10-17T19:43:46Z

⌛ Testing commit 539404b with merge 43ab5b1...

@pnkfelix

NLL: change compare-mode=nll to use borrowck=migrate Fixes #55118. This PR is split into two parts: The first commit is a minor change that fixes a flaw in the existing `borrowck=migrate` implementation whereby a lint that was promoted to an error in the AST borrow checker would result in the same lint from the NLL borrow checker being downgraded to a warning in migrate mode. This PR fixes this by ensuring lints are exempt from buffering in the NLL borrow checker. The second commit updates `compiletest` to make the NLL compare mode use `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The third commit shows all the test output changes that result from this. r? @pnkfelix

bors · 2018-10-17T21:34:08Z

💔 Test failed - status-travis

rust-highfive · 2018-10-17T21:34:10Z

The job dist-i586-gnu-i586-i686-musl of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_fold:end:dpl_0
travis_time:start:01bdebe5
travis_fold:start:dpl.1
Installing deploy dependencies
ERROR:  Could not find a valid gem 'aws-sdk-resources' (= 2.11.152) in any repository
ERROR:  Possible alternatives: aws-sdk-resources
travis_fold:end:dpl.1
/home/travis/.rvm/rubies/ruby-2.2.7/lib/ruby/site_ruby/2.2.0/rubygems/core_ext/kernel_require.rb:59:in `require': cannot load such file -- dpl/provider/s3 (LoadError)
 from /home/travis/.rvm/rubies/ruby-2.2.7/lib/ruby/site_ruby/2.2.0/rubygems/core_ext/kernel_require.rb:59:in `require'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/provider.rb:94:in `rescue in block in new'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/provider.rb:69:in `block in new'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/cli.rb:41:in `fold'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/provider.rb:68:in `new'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/cli.rb:31:in `run'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/lib/dpl/cli.rb:7:in `run'
 from /home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-1.10.3/bin/dpl:5:in `<top (required)>'
 from /home/travis/.rvm/gems/ruby-2.2.7/bin/dpl:23:in `load'
 from /home/travis/.rvm/gems/ruby-2.2.7/bin/dpl:23:in `<main>'
failed to deploy

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Mark-Simulacrum · 2018-10-17T22:41:20Z

@bors retry

Should definitely not be related to this...

bors · 2018-10-17T23:16:18Z

⌛ Testing commit 539404b with merge f7eb7fb...

@pnkfelix

NLL: change compare-mode=nll to use borrowck=migrate Fixes #55118. This PR is split into two parts: The first commit is a minor change that fixes a flaw in the existing `borrowck=migrate` implementation whereby a lint that was promoted to an error in the AST borrow checker would result in the same lint from the NLL borrow checker being downgraded to a warning in migrate mode. This PR fixes this by ensuring lints are exempt from buffering in the NLL borrow checker. The second commit updates `compiletest` to make the NLL compare mode use `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The third commit shows all the test output changes that result from this. r? @pnkfelix

bors · 2018-10-18T01:51:42Z

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

davidtwco added 3 commits October 17, 2018 00:47

Change NLL compare mode to borrowck=migrate.

8b34881

This commit changes the NLL compare mode to pass `-Z borrowck=migrate` rather than `-Z borrowck=nll` to better test what will be deployed. It does not include the test output updates, as separation of these commits makes reviewing simpler.

Update output for borrowck=migrate compare mode.

539404b

This commit updates the test output for the updated NLL compare mode that uses `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The previous commit changes `compiletest` and this commit only updates `.nll.stderr` files.

rust-highfive assigned pnkfelix Oct 16, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 16, 2018

pnkfelix added the I-needs-decision Issue: In need of a decision. label Oct 17, 2018

pnkfelix removed the I-needs-decision Issue: In need of a decision. label Oct 17, 2018

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2018

bors mentioned this pull request Oct 17, 2018

miri engine: Hooks for basic stacked borrows #55125

Merged

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2018

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2018

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2018

bors merged commit 539404b into rust-lang:master Oct 18, 2018

This was referenced Oct 18, 2018

Make raw ptr ops unsafe in const contexts #55009

Merged

[NLL] Use new region infer errors when explaining borrows #55069

Merged

support type annot in constants, casts #55152

Merged

Stabilize impl_header_lifetime_elision in 2015 #54778

Merged

davidtwco deleted the issue-55118 branch October 18, 2018 09:11

pnkfelix mentioned this pull request Jan 25, 2019

[NLL] Clean up handling of type annotations #57714

Merged

kennytm mentioned this pull request Feb 6, 2019

Spurious SIGILL (signal 4) when linking with cc on macOS during doctest #58209

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NLL: change compare-mode=nll to use borrowck=migrate #55134

NLL: change compare-mode=nll to use borrowck=migrate #55134

davidtwco commented Oct 16, 2018 •

edited

Loading

davidtwco commented Oct 16, 2018

pnkfelix commented Oct 17, 2018 •

edited

Loading

pnkfelix commented Oct 17, 2018

pnkfelix commented Oct 17, 2018

bors commented Oct 17, 2018

pnkfelix commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

davidtwco commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

rust-highfive commented Oct 17, 2018

Mark-Simulacrum commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 18, 2018

NLL: change compare-mode=nll to use borrowck=migrate #55134

NLL: change compare-mode=nll to use borrowck=migrate #55134

Conversation

davidtwco commented Oct 16, 2018 • edited Loading

davidtwco commented Oct 16, 2018

pnkfelix commented Oct 17, 2018 • edited Loading

pnkfelix commented Oct 17, 2018

pnkfelix commented Oct 17, 2018

bors commented Oct 17, 2018

pnkfelix commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

davidtwco commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

rust-highfive commented Oct 17, 2018

Mark-Simulacrum commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 18, 2018

davidtwco commented Oct 16, 2018 •

edited

Loading

pnkfelix commented Oct 17, 2018 •

edited

Loading