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 detailed error explanation for E0505 #33475

Merged
merged 1 commit into from
May 15, 2016
Merged

Add detailed error explanation for E0505 #33475

merged 1 commit into from
May 15, 2016

Conversation

billyevans
Copy link
Contributor

Part of #32777

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @arielb1 (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.

GuillaumeGomez
GuillaumeGomez reviewed May 7, 2016
View reviewed changes
src/librustc_borrowck/diagnostics.rs
@@ -390,6 +390,85 @@ fn foo(a: &mut i32) {
```
"##,

E0505: r##"
You tried to move out of a value which was borrowed before.
Copy link
Member

Choose a reason for hiding this comment

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

Could you rewrite this sentence in "a neutral way" please? Something like "A value was moved out while it was still borrowed".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I found almost this sentence description for E0507, should I change that as well ?

@GuillaumeGomez
Copy link
Member

Thanks a lot for your work! Just a few nits to fix and we're good to merge. (Don't forget your commits once done please.)

@billyevans
Copy link
Contributor Author

Thank you for review, do you want to squash changes in one commit, right ?

@GuillaumeGomez
Copy link
Member

Yes, at final, except if you do something else than adding this error code explanation (which I don't recommend), we expect only one commit.

@bors
Copy link
Contributor

bors commented May 7, 2016

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

@billyevans billyevans force-pushed the master branch 2 times, most recently from 53338ec to d0147ec Compare May 8, 2016 11:57
@GuillaumeGomez
Copy link
Member

Thanks!

r=me @steveklabnik @Manishearth

@steveklabnik
Copy link
Member

@bors: r=guillaumegomez rollup

@bors
Copy link
Contributor

bors commented May 10, 2016

📌 Commit d0147ec has been approved by guillaumegomez

@steveklabnik steveklabnik mentioned this pull request May 11, 2016
Merged
bors added a commit that referenced this pull request May 11, 2016
@bors
Auto merge of #33556 - steveklabnik:rollup, r=steveklabnik
e37f859 
Rollup of 9 pull requests

- Successful merges: #33129, #33260, #33345, #33386, #33522, #33524, #33528, #33539, #33542
- Failed merges: #33342, #33475, #33517
@bors
Copy link
Contributor

bors commented May 11, 2016

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

@GuillaumeGomez GuillaumeGomez mentioned this pull request May 11, 2016
Merged
bors added a commit that referenced this pull request May 11, 2016
@bors
Auto merge of #33562 - GuillaumeGomez:rollup, r=steveklabnik
22ac88f 
Rollup of 3 pull requests

- Successful merges: #33401, #33489, #33558
- Failed merges: #33342, #33475, #33517
@GuillaumeGomez
Copy link
Member

@billyevans: Is it ready to get merged?

@billyevans
Copy link
Contributor Author

@GuillaumeGomez Yes, I merged it with upstream recently. I hope it will be without conflicts.

@GuillaumeGomez
Copy link
Member

It seems it's good. Thanks!

r=me @steveklabnik

@steveklabnik
Copy link
Member

@bors: r=guillaumegomez rollup

@bors
Copy link
Contributor

bors commented May 13, 2016

📌 Commit bf09a9e has been approved by guillaumegomez

sanxiyn added a commit to sanxiyn/rust that referenced this pull request May 14, 2016
@sanxiyn
Rollup merge of rust-lang#33475 - billyevans:master, r=guillaumegomez
13d0d6a 
Add detailed error explanation for E0505

Part of rust-lang#32777
@sanxiyn sanxiyn mentioned this pull request May 14, 2016
Closed
bors added a commit that referenced this pull request May 14, 2016
@bors
Auto merge of #33629 - sanxiyn:rollup, r=sanxiyn
a9d15db 
Rollup of 15 pull requests

- Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33590, #33591, #33598, #33603, #33604, #33605
- Failed merges: #33578
@eddyb eddyb mentioned this pull request May 14, 2016
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request May 15, 2016
@Manishearth
Rollup merge of rust-lang#33475 - billyevans:master, r=guillaumegomez
7003253 
Add detailed error explanation for E0505

Part of rust-lang#32777
@Manishearth Manishearth mentioned this pull request May 15, 2016
Merged
bors added a commit that referenced this pull request May 15, 2016
@bors
Auto merge of #33658 - Manishearth:rollup, r=Manishearth
9f58fb7 
Rollup of 14 pull requests

- Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33584, #33585, #33590, #33591, #33598
- Failed merges: #33578
@bors bors merged commit bf09a9e into rust-lang:master May 15, 2016
bors added a commit that referenced this pull request May 16, 2016
@bors
Auto merge of #33643 - eddyb:rollup, r=eddyb
bb39c49 
Rollup of 27 pull requests

- Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33584, #33585, #33588, #33590, #33591, #33593, #33598, #33600, #33602, #33603, #33604, #33605, #33607, #33612, #33620, #33633, #33634, #33635
- Failed merges: #33578
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@GuillaumeGomez GuillaumeGomez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@billyevans @rust-highfive @GuillaumeGomez @bors @steveklabnik @arielb1