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.

Sign up for GitHub

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

Jump to bottom

Add a note describing the type of the non-Copy moved variable #56843

Merged
merged 2 commits into from
Dec 30, 2018
Merged

Add a note describing the type of the non-Copy moved variable #56843

merged 2 commits into from
Dec 30, 2018

Conversation

csmoe
Copy link
Member

@csmoe csmoe commented Dec 15, 2018

Closes #56654
r?@davidtwco

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

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member

Looks good to me, can merge this once existing review comments are resolved.

@csmoe
Copy link
Member Author

csmoe commented Dec 17, 2018

@davidtwco oops, my fault, the .nll.stderr still unchanged, but while compiling with -Z borrowck=mir locally, the note was added indeed, how to trigger the diff in nll mode?

@davidtwco
Copy link
Member

@davidtwco oops, my fault, the .nll.stderr still unchanged, but while compiling with -Z borrowck=mir locally, the note was added indeed, how to trigger the diff in nll mode?

I'm not exactly sure what you're asking - but if you want to run the tests with both compare modes, you'll need to change your config.toml. After that, running the UI tests with bless will update the NLL stderr files.

@csmoe

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member

@davidtwco I mean note= was not append to ui/use/use-after-move-self.nll.stderr as this PR wanna fix. while compiling the single test case locally: ./build/.../rustc src/test/ui/use/use-after-move-self.rs -Z borrowck=mir, the note= was outputted indeed. but ./x.py test src/test/ui didn't complain about diff between stderr and stdout.

If there is no difference between the AST and NLL output then there is only a .stderr file, does this explain what you are seeing?

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 17, 2018

📌 Commit 37c3561 has been approved by davidtwco

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 20, 2018
@pietroalbini
Rollup merge of rust-lang#56843 - csmoe:non-copy, r=davidtwco
063e4a2 
Add a note describing the type of the non-Copy moved variable

Closes rust-lang#56654
r?@davidtwco
@pietroalbini pietroalbini mentioned this pull request Dec 20, 2018
Closed
@bors
Copy link
Contributor

bors commented Dec 20, 2018

⌛ Testing commit 37c3561 with merge afa2c0440f42243f75703fb3b2ce3e9324626575...

@bors
Copy link
Contributor

bors commented Dec 20, 2018

💔 Test failed - status-travis

@rust-highfive

This comment has been minimized.

Sign in to view
@bors 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 Dec 20, 2018
@alexcrichton
Copy link
Member

@bors: retry

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 20, 2018
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2018
@Centril
Rollup merge of rust-lang#56843 - csmoe:non-copy, r=davidtwco
e0fb972 
Add a note describing the type of the non-Copy moved variable

Closes rust-lang#56654
r?@davidtwco
@Centril Centril mentioned this pull request Dec 22, 2018
Closed
@bors
Copy link
Contributor

bors commented Dec 22, 2018

⌛ Testing commit 37c3561 with merge 6f4f93d17c18132d100dc63dcb8cbd53070f7fba...

@bors
Copy link
Contributor

bors commented Dec 22, 2018

💔 Test failed - status-travis

@bors 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 Dec 22, 2018
@davidtwco
Copy link
Member

@csmoe could you rebase this PR on top of master (a PR gets merged with master before running any tests but that means that some new tests that this might apply to won’t have had their output updated - hence the need to rebase) and make sure you are running and updating the test output for the NLL compare mode too?

@csmoe
Copy link
Member Author

csmoe commented Dec 22, 2018

@davidtwco soon.

@kennytm kennytm 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 Dec 22, 2018
@csmoe csmoe force-pushed the non-copy branch 2 times, most recently from 6fcf80b to d3251f8 Compare December 23, 2018 13:18
@bors
Copy link
Contributor

bors commented Dec 26, 2018

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

@csmoe
retrieve ty info from place_ty
8d77c7c 
describe index with _
@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 27, 2018
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2018

📌 Commit 48de0ff has been approved by davidtwco

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2018
@bors
Copy link
Contributor

bors commented Dec 29, 2018

⌛ Testing commit 48de0ff with merge a35cf79...

bors added a commit that referenced this pull request Dec 29, 2018
@bors
Auto merge of #56843 - csmoe:non-copy, r=davidtwco
a35cf79 
Add a note describing the type of the non-Copy moved variable

Closes #56654
r?@davidtwco
@bors
Copy link
Contributor

bors commented Dec 30, 2018

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

@bors bors merged commit 48de0ff into rust-lang:master Dec 30, 2018
@bors bors mentioned this pull request Dec 30, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco left review comments

@bjorn3 bjorn3 bjorn3 requested changes

@matthewjasper matthewjasper matthewjasper left review comments

Assignees

@davidtwco davidtwco

Labels
S-waiting-on-bors Status: 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.
8 participants
@csmoe @rust-highfive @davidtwco @bors @alexcrichton @bjorn3 @matthewjasper @kennytm