Skip to content

[NLL] Small move error reporting improvements - #52359

Merged
bors merged 4 commits into
rust-lang:masterfrom
matthewjasper:combine-move-error-reporting
Jul 22, 2018
Merged

[NLL] Small move error reporting improvements#52359
bors merged 4 commits into
rust-lang:masterfrom
matthewjasper:combine-move-error-reporting

Conversation

@matthewjasper

@matthewjaspermatthewjasper commented Jul 13, 2018

Copy link
Copy Markdown
Contributor
  • Use a MirBorrowckContext when reporting errors to be more uniform with other error reporting
  • Add a special message for the case of trying to move from capture variables in Fn and FnMut closures.

part of #51028

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 13, 2018
@matthewjasper

Copy link
Copy Markdown
ContributorAuthor

r? @pnkfelix

@rust-highfiverust-highfive assigned pnkfelix and unassigned eddybJul 13, 2018
@pnkfelix

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d1acee6ed179b568d62c55bbce960782386188b2 has been approved by pnkfelix

@borsbors 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 Jul 17, 2018
@bors

bors commented Jul 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d1acee6ed179b568d62c55bbce960782386188b2 with merge 94074eada69e5a6390c1e4c8bbe5080e46693a9f...

@bors

bors commented Jul 18, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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 Jul 18, 2018
@kennytm

Copy link
Copy Markdown
Member
---- [ui (nll)] ui\issue-30355.rs stdout ----
diff of stderr:
-	error[E0508]: cannot move out of type `[u8]`, a non-copy slice
- --> $DIR/issue-30355.rs:15:8
- |
-	LL | &X(*Y)
- | ^^ cannot move out of here
- 7	error[E0161]: cannot move a value of type X: the size of X cannot be statically determined
8 --> $DIR/issue-30355.rs:15:6
9 |
15 |
16	LL | &X(*Y)
17 | ^^
+ +	error[E0508]: cannot move out of type `[u8]`, a non-copy slice
+ --> $DIR/issue-30355.rs:15:8
+ |
+	LL | &X(*Y)
+ | ^^ cannot move out of here
18 19	error: aborting due to 3 previous errors
20 

@kennytmkennytm 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 18, 2018
@matthewjasper
matthewjasperforce-pushed the combine-move-error-reporting branch from d1acee6 to 29bbb12CompareJuly 18, 2018 20:03
@matthewjasper

Copy link
Copy Markdown
ContributorAuthor

Tests updated

@kennytm

Copy link
Copy Markdown
Member

@bors r=pnkfelix

@bors

bors commented Jul 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 29bbb1264e2fcf579d363fdff84d8a69d9261c4b has been approved by pnkfelix

@borsbors 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 18, 2018
@euclio

Copy link
Copy Markdown
Contributor

I realize this PR's already been approved, but if there's still time, it would be worth removing this line (merged in #52197), since this PR fixes the ICE in that test.

@matthewjasper
matthewjasperforce-pushed the combine-move-error-reporting branch from 29bbb12 to 8829aeeCompareJuly 19, 2018 20:15
@matthewjasper

Copy link
Copy Markdown
ContributorAuthor

Done, needs another r+.

@bors

bors commented Jul 21, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 21, 2018
@matthewjasper
matthewjasperforce-pushed the combine-move-error-reporting branch from 8829aee to d34924dCompareJuly 21, 2018 17:41
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r=pnkfelix

@bors

bors commented Jul 21, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d34924d has been approved by pnkfelix

@borsbors 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 21, 2018
@bors

bors commented Jul 22, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d34924d with merge 742e09cdd5516bad425f81372bbcaa9582434ae7...

@bors

bors commented Jul 22, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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 Jul 22, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-aux 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.

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)

@kennytm

Copy link
Copy Markdown
Member

@bors retry travis-ci/travis-ci#9696

[01:51:58] fatal: unable to access 'https://github.com/dzamlo/treeify/': Could not resolve host: github.com

@borsbors 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 Jul 22, 2018
@bors

bors commented Jul 22, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d34924d with merge aeca042...

bors added a commit that referenced this pull request Jul 22, 2018
…pnkfelix
[NLL] Small move error reporting improvements
* Use a MirBorrowckContext when reporting errors to be more uniform with other error reporting
* Add a special message for the case of trying to move from capture variables in `Fn` and `FnMut` closures.
part of #51028
@bors

bors commented Jul 22, 2018

Copy link
Copy Markdown
Collaborator

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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

8 participants

@matthewjasper@rust-highfive@pnkfelix@bors@kennytm@euclio@Mark-Simulacrum@eddyb