Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
csmoe:non-copy
Dec 30, 2018
Merged

Add a note describing the type of the non-Copy moved variable#56843
bors merged 2 commits into
rust-lang:masterfrom
csmoe:non-copy

Conversation

@csmoe

Copy link
Copy Markdown
Contributor

@rust-highfiverust-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.

@rust-highfive

This comment has been minimized.

Comment threadsrc/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr
Comment threadsrc/test/ui/use/use-after-move-self.rs Outdated
@davidtwco

Copy link
Copy Markdown
Member

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

@csmoe

Copy link
Copy Markdown
ContributorAuthor

@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
Copy Markdown
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.

@davidtwco

Copy link
Copy Markdown
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
Copy Markdown
Member

@bors r+

@bors

bors commented Dec 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 37c3561 has been approved by davidtwco

@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 Dec 17, 2018
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Dec 20, 2018
Add a note describing the type of the non-Copy moved variable
Closesrust-lang#56654
r?@davidtwco
@bors

bors commented Dec 20, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 37c3561 with merge afa2c0440f42243f75703fb3b2ce3e9324626575...

@bors

bors commented Dec 20, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@rust-highfive

This comment has been minimized.

@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 Dec 20, 2018
@alexcrichton

Copy link
Copy Markdown
Member

@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 Dec 20, 2018
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2018
Add a note describing the type of the non-Copy moved variable
Closesrust-lang#56654
r?@davidtwco
@CentrilCentril mentioned this pull request Dec 22, 2018
@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Dec 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 Dec 22, 2018
@davidtwco

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

@davidtwco soon.

@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 Dec 22, 2018
@csmoe
csmoeforce-pushed the non-copy branch 2 times, most recently from 6fcf80b to d3251f8CompareDecember 23, 2018 13:18
@bors

bors commented Dec 26, 2018

Copy link
Copy Markdown
Collaborator

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

describe index with _
@kennytmkennytm 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
Comment threadsrc/test/ui/use/use-after-move-self.rs Outdated
@davidtwco

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Dec 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 48de0ff has been approved by davidtwco

@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 Dec 29, 2018
@bors

bors commented Dec 29, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 48de0ff with merge a35cf79...

bors added a commit that referenced this pull request Dec 29, 2018
Add a note describing the type of the non-Copy moved variable
Closes#56654
r?@davidtwco
@bors

bors commented Dec 30, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 48de0ff into rust-lang:masterDec 30, 2018
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

@csmoe@rust-highfive@davidtwco@bors@alexcrichton@bjorn3@matthewjasper@kennytm