Skip to content

Add detailed error explanation for E0506 - #33384

Merged
bors merged 1 commit into
rust-lang:masterfrom
cramertj:E0506
May 7, 2016
Merged

Add detailed error explanation for E0506#33384
bors merged 1 commit into
rust-lang:masterfrom
cramertj:E0506

Conversation

@cramertj

@cramertjcramertj commented May 3, 2016

Copy link
Copy Markdown
Member

Part of #32777

@rust-highfive

rust-highfive commented May 3, 2016

Copy link
Copy Markdown
Contributor

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 3, 2016
View reviewed changes
Comment threadsrc/librustc_borrowck/diagnostics.rs Outdated

@GuillaumeGomezGuillaumeGomezMay 3, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Or even a function (it might even be simpler to understand actually). Could you improve this example by adding a "function scope" (which does the same thing but whatever) please?

@cramertjcramertjMay 3, 2016

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm not sure what you mean by this. Are you saying to move the middle logic out into a separate function like this?

@GuillaumeGomezGuillaumeGomezMay 4, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just like your second example.

@cramertj

cramertj commented May 4, 2016

Copy link
Copy Markdown
MemberAuthor

@GuillaumeGomez

GuillaumeGomez
GuillaumeGomez reviewed May 4, 2016
View reviewed changes
Comment threadsrc/librustc_borrowck/diagnostics.rs Outdated

@GuillaumeGomezGuillaumeGomezMay 4, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It should "Example of erroneous code". Discussion here: #32989 (comment)

@GuillaumeGomez

GuillaumeGomez commented May 4, 2016

Copy link
Copy Markdown
Member

Except for the last nit, it's all good. Please fix, squash and then it's good to get merged!

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

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

@cramertj
Add detailed error explanation for E0506
8facc97
Broke up long lines in E0506
Trimmed E0506 comment to be under max line width
Added function example to E0506
Changed example of erroneous code wording on E0506
@GuillaumeGomez

GuillaumeGomez commented May 5, 2016

Copy link
Copy Markdown
Member

All good for me! Thanks @cramertj!

r=me @steveklabnik@Manishearth

@arielb1

arielb1 commented May 7, 2016

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented May 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8facc97 has been approved by arielb1

steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
@steveklabnik
Rollup merge ofrust-lang#33384- cramertj:E0506, r=arielb1
2926fe4
Add detailed error explanation for E0506
Part of rust-lang#32777
@steveklabniksteveklabnik mentioned this pull request May 7, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
@steveklabnik
Rollup merge ofrust-lang#33384- cramertj:E0506, r=arielb1
04f2972
Add detailed error explanation for E0506
Part of rust-lang#32777
@steveklabniksteveklabnik mentioned this pull request May 7, 2016
Merged
bors added a commit that referenced this pull request May 7, 2016
@bors
Auto merge of#33487- steveklabnik:rollup, r=steveklabnik
d91f8ab
Rollup of 20 pull requests
- Successful merges: #33256, #33283, #33313, #33314, #33326, #33336, #33382, #33384, #33402, #33409, #33410, #33412, #33428, #33430, #33437, #33438, #33439, #33442, #33456, #33459
- Failed merges:
@bors
bors merged commit 8facc97 into rust-lang:masterMay 7, 2016
@cramertj
cramertj deleted the E0506 branch May 25, 2016 19:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cramertj@rust-highfive@GuillaumeGomez@bors@arielb1