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

Improve cannot move out of error message #99629

Merged
merged 1 commit into from
Aug 1, 2022
Merged

Improve cannot move out of error message #99629

merged 1 commit into from
Aug 1, 2022

Conversation

obeis
Copy link
Contributor

@obeis obeis commented Jul 22, 2022

Closes #99470
r? @bjorn3

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 22, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2022
@obeis obeis changed the title Improve some error message Improve some error messages Jul 22, 2022
@bjorn3
Copy link
Member

bjorn3 commented Jul 23, 2022

Not familiar with the borrowck impl.

r? @compiler-errors Feel free to reassign.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors compiler-errors 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 24, 2022
@obeis
Copy link
Contributor Author

obeis commented Jul 24, 2022

@rustbot ready

@rustbot rustbot 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 Jul 24, 2022
@obeis obeis requested a review from compiler-errors July 26, 2022 07:11
compiler-errors
compiler-errors reviewed Jul 27, 2022
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@obeis, can you please squash all of your changes into one commit?

compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/move_errors.rs Outdated Show resolved Hide resolved
@obeis obeis changed the title Improve some error messages Improve cannot move out of error message Jul 28, 2022
@obeis obeis requested a review from compiler-errors July 28, 2022 04:26
@compiler-errors
Copy link
Member

One last comment and then I think this might ready to land.

@obeis obeis requested a review from compiler-errors July 28, 2022 22:52
@bors
Copy link
Contributor

bors commented Jul 31, 2022

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member

@obeis please rebase your changes instead of using a merge commit

@obeis
Copy link
Contributor Author

obeis commented Jul 31, 2022

@compiler-errors fixed!

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 1, 2022

📌 Commit 86dd457 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Aug 1, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 1, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2022
@bors
Auto merge of rust-lang#100024 - matthiaskrgr:rollup-36ab4wx, r=matth…
c9e134e 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#99340 (Fix ICE in Definitions::create_def)
 - rust-lang#99629 (Improve `cannot move out of` error message)
 - rust-lang#99864 (bootstrap: don't emit warn about duplicated deps with same/different features if some of sets actually empty)
 - rust-lang#99911 (Remove some uses of `guess_head_span`)
 - rust-lang#99976 (Make Rustdoc exit with correct error code when scraping examples from invalid files)
 - rust-lang#100003 (Improve size assertions.)
 - rust-lang#100012 (Avoid `Ty` to `String` conversions)
 - rust-lang#100020 (better error when python is not found in x - issue rust-lang#99648)

Failed merges:

 - rust-lang#99994 (Replace `guess_head_span` with `opt_span`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f9aa989 into rust-lang:master Aug 1, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 1, 2022
@obeis obeis deleted the issue-99470 branch May 13, 2023 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors Awaiting requested review from compiler-errors

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

Error message mentions "x.0" (x is Option)
7 participants
@obeis @bjorn3 @rust-log-analyzer @compiler-errors @bors @rust-highfive @rustbot