Add better error message for partial move #58199

clintfred · 2019-02-05T21:01:10Z

rust-highfive · 2019-02-05T21:01:13Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

clintfred · 2019-02-05T21:01:59Z

I have several tests failing on my branch, but am hoping this PR will allow others to help me move forward.

davidtwco · 2019-02-05T21:06:01Z

@clintfred Excited to see this PR! Could you update those test outputs and add them to the PR so that we can see what outputs you are getting and add review comments with steps to take?

clintfred · 2019-02-05T21:21:40Z

@clintfred Excited to see this PR! Could you update those test outputs and add them to the PR so that we can see what outputs you are getting and add review comments with steps to take?

@davidtwco I'm not sure I understand your request. Won't we see the failing tests when CI runs? Or does it run only some intelligent subset of the tests based on what's changed?

davidtwco · 2019-02-05T21:23:48Z

@clintfred We will, but it's easier to put review comments and have discussions on your changes than the test results.

estebank · 2019-02-06T09:39:48Z

@clintfred you can run ./x.py test src/test/ui --stage 1 --bless, which will update the .stderr files. After doing that I think the PR can be approved. You can see the current test errors in Travis (they all seem to be stderr output mismatch and nothing else).

clintfred · 2019-02-06T15:40:29Z

@estebank I think that's the same set of failures I was seeing on my machine, so that's a good sign. When reviewing them on my own, it wasn't clear to me that all of those error messages were correct after my change. I will look again, but I would appreciate confirmation from others that they look correct as well.

I will run with --bless so we can get all the files into this PR regardless per @davidtwco's instructions.

…al --bless

davidtwco

Looking great. Here are some small changes.

src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr

src/librustc_mir/borrow_check/error_reporting.rs

src/test/ui/borrowck/borrowck-issue-48962.stderr

src/librustc_mir/borrow_check/error_reporting.rs

… the move was partial

src/librustc_mir/borrow_check/error_reporting.rs

clintfred · 2019-02-13T16:38:15Z

I have implemented the suggested changes. Some tests will start failing again and hopefully they will be all the tests that were previously erroneously marked as partial moves... If so, I can rerun the --bless

estebank · 2019-02-13T19:38:22Z

https://travis-ci.com/rust-lang/rust/jobs/177505407#L2819

davidtwco · 2019-02-14T11:43:13Z

travis-ci.com/rust-lang/rust/jobs/177505407#L2819

A quick glance makes me think that these are all correct. Feel free to bless and push @clintfred.

estebank · 2019-02-18T19:43:23Z

@bors r+

bors · 2019-02-18T19:43:24Z

📌 Commit de05548 has been approved by estebank

bors · 2019-02-18T19:43:25Z

🌲 The tree is currently closed for pull requests below priority 160, this pull request will be tested once the tree is reopened

estebank · 2019-02-18T19:44:10Z

Oh, sorry, didn't realize that you were the reviewer, @davidtwco. Feel free to r- if you disagree.

davidtwco · 2019-02-18T19:56:06Z

Oh, sorry, didn't realize that you were the reviewer, @davidtwco. Feel free to r- if you disagree.

No worries, this looks great! Thanks @clintfred!

kennytm · 2019-02-19T17:00:28Z

@bors r- rollup-

Failed in NLL mode in #58566 (comment). Needs to update the text (bless) these 6 test cases:

[01:30:22] failures:
[01:30:22]     [ui (nll)] ui/borrowck/borrowck-uninit-field-access.rs#ast
[01:30:22]     [ui (nll)] ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs
[01:30:22]     [ui (nll)] ui/moves/moves-based-on-type-match-bindings.rs
[01:30:22]     [ui (nll)] ui/ref-suggestion.rs
[01:30:22]     [ui (nll)] ui/unsized-locals/borrow-after-move.rs
[01:30:22]     [ui (nll)] ui/unsized-locals/double-move.rs

clintfred · 2019-02-19T17:07:42Z

@kennytm I'll take a look.

estebank · 2019-02-19T19:07:36Z

I think all you have to do is run the same ./x.py ... --bless command with --compare-mode=nll to update these files.

estebank · 2019-02-20T18:13:30Z

@bors r+ rollup

bors · 2019-02-20T18:13:31Z

📌 Commit 02fe6a7 has been approved by estebank

estebank · 2019-02-20T23:48:27Z

@bors rollup-

clintfred · 2019-02-21T17:24:42Z

@estebank I'm not sure of the status here. Do I need to do anything?

estebank · 2019-02-21T18:03:40Z

@clintfred not for the moment, I removed the rollup because this has the potential to clash with other PRs that incorporate partial move errors. Because the stderr files would be new, and generated from a parent commit that didn't have your changes there would be no merge conflict, but the tests would fail because of the discrepancy between both changes. This PR is still approved and will be merged on its own. There's the potential of a different PR being merged in the meantime that will necessitate you to rebase and re-bless, but no other action will be required of you.

Thank you for all the effort you've put into this! These small incremental improvements add up and are critical to maintaining the quality we want to see in rustc.

@davidtwco