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

Update E0057 error message to new format #35395

Closed
wants to merge 1 commit into from
Closed

Update E0057 error message to new format #35395

wants to merge 1 commit into from

Conversation

paulfanelli
Copy link
Contributor

Fixes #35214 as part of #35233.

r? @jonathandturner

@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 @jonathandturner (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.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 5, 2016

Looks good!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit edca8ec has been approved by jonathandturner

@bors
Copy link
Contributor

bors commented Aug 5, 2016

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

@sophiajt sophiajt mentioned this pull request Aug 5, 2016
Closed
bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #35397 - jonathandturner:rollup, r=jonathandturner
43446fc 
Rollup of 18 pull requests

- Successful merges: #34916, #35287, #35288, #35331, #35353, #35356, #35363, #35364, #35366, #35368, #35370, #35372, #35373, #35374, #35375, #35376, #35380, #35394
- Failed merges: #35395
@eddyb eddyb mentioned this pull request Aug 6, 2016
Merged
bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #35407 - eddyb:rollup, r=eddyb
444ff9f 
Rollup of 21 pull requests

- Successful merges: #33951, #34916, #35287, #35288, #35351, #35353, #35356, #35362, #35363, #35364, #35366, #35368, #35370, #35372, #35373, #35374, #35375, #35376, #35380, #35393, #35394
- Failed merges: #35331, #35395
@sophiajt sophiajt mentioned this pull request Aug 6, 2016
Closed
bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #35430 - jonathandturner:rollup, r=jonathandturner
f0d7e4e 
Rollup of 9 pull requests

- Successful merges: #35362, #35393, #35394, #35402, #35410, #35411, #35413, #35419, #35421
- Failed merges: #35395, #35415
@sophiajt sophiajt mentioned this pull request Aug 7, 2016
Closed
This was referenced Aug 7, 2016
Closed
Merged
bors added a commit that referenced this pull request Aug 7, 2016
@bors
Auto merge of #35469 - jonathandturner:rollup, r=jonathandturner
1744c46 
Rollup of 21 pull requests

- Successful merges: #35314, #35355, #35357, #35366, #35394, #35410, #35411, #35413, #35417, #35419, #35421, #35429, #35433, #35434, #35436, #35439, #35443, #35454, #35455, #35467, #35468
- Failed merges: #35395, #35415
@sophiajt sophiajt mentioned this pull request Aug 7, 2016
Closed
bors added a commit that referenced this pull request Aug 7, 2016
@bors
Auto merge of #35476 - jonathandturner:rollup, r=jonathandturner
8913330 
Rollup of 6 pull requests

- Successful merges: #35396, #35402, #35446, #35466, #35470, #35475
- Failed merges: #35395, #35415
@bors
Copy link
Contributor

bors commented Aug 8, 2016

🔒 Merge conflict

@sophiajt sophiajt mentioned this pull request Aug 8, 2016
Merged
@steveklabnik steveklabnik mentioned this pull request Aug 10, 2016
Closed
bors added a commit that referenced this pull request Aug 10, 2016
@bors
Auto merge of #35525 - jonathandturner:rollup, r=jonathandturner
1f2ae38 
Rollup of 15 pull requests

- Successful merges: #35371, #35396, #35446, #35449, #35452, #35458, #35465, #35466, #35470, #35475, #35477, #35484, #35504, #35507, #35524
- Failed merges: #35395, #35415
@sophiajt sophiajt mentioned this pull request Aug 10, 2016
Closed
@sophiajt sophiajt mentioned this pull request Aug 11, 2016
Merged
bors added a commit that referenced this pull request Aug 11, 2016
@bors
Auto merge of #35592 - jonathandturner:rollup, r=jonathandturner
8787a12 
Rollup of 23 pull requests

- Successful merges: #35279, #35331, #35358, #35375, #35445, #35448, #35482, #35486, #35505, #35528, #35530, #35532, #35536, #35537, #35541, #35552, #35554, #35555, #35557, #35562, #35565, #35569, #35576
- Failed merges: #35395, #35415, #35563
This was referenced Aug 14, 2016
Closed
Merged
@sophiajt sophiajt mentioned this pull request Aug 19, 2016
Closed
@sophiajt sophiajt mentioned this pull request Aug 20, 2016
Closed
@sophiajt sophiajt mentioned this pull request Aug 22, 2016
Closed
@sophiajt sophiajt mentioned this pull request Aug 22, 2016
Merged
bors added a commit that referenced this pull request Aug 22, 2016
@bors
Auto merge of #35908 - jonathandturner:rollup, r=jonathandturner
d0da7f6 
Rollup of 20 pull requests

- Successful merges: #35360, #35526, #35809, #35817, #35820, #35824, #35835, #35841, #35842, #35858, #35860, #35861, #35864, #35878, #35879, #35881, #35882, #35889, #35891, #35901
- Failed merges: #35395
@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 23, 2016
Merged
bors added a commit that referenced this pull request Aug 23, 2016
@bors
Auto merge of #35951 - GuillaumeGomez:rollup, r=GuillaumeGomez
a66fa96 
Rollup of 6 pull requests

- Successful merges: #35910, #35912, #35913, #35936, #35939, #35949
- Failed merges: #35395
@sophiajt
Copy link
Contributor

@paulfanelli - can you update this to fix the merge conflict? With that, I think we're good to go.

@paulfanelli
Copy link
Contributor Author

Will do...I'll take a look at.

@sophiajt sophiajt mentioned this pull request Aug 24, 2016
Merged
bors added a commit that referenced this pull request Aug 25, 2016
@bors
Auto merge of #35971 - jonathandturner:rollup, r=jonathandturner
0ccd5c8 
Rollup of 4 pull requests

- Successful merges: #35876, #35920, #35948, #35961
- Failed merges: #35395
@paulfanelli
Copy link
Contributor Author

Looks like the reason there was a conflict, is that someone else had also fixed it. To fix the conflict, I updated my fork with the latest rust code and rebased my branch where i did the work (update-e0057-error-msg) onto the lastest rust code. I re-complied and tested it. I then pushed the updated code back to the update-e0057-error-msg branch of my fork. I think this pull request now is good to go. (?)

@sophiajt
Copy link
Contributor

@paulfanelli - if I'm reading this right, did someone fix this issue already? If so, I can close this and you can pick another one from the list (if you like): #35233

@paulfanelli
Copy link
Contributor Author

Yep, someone fixed it, just a bit differently. Ok, go ahead and close this and I'll take #35233 , if still available.

@paulfanelli
Copy link
Contributor Author

Oops, didn't realize that #35233 is the catch-all issue; can't take them all, lol. I'll pick something from the list.

@paulfanelli
Copy link
Contributor Author

Hey, just a heads up, I never did any bonus work on this one. Not sure if whoever fixed it, did either.

@bors
Copy link
Contributor

bors commented Sep 6, 2016

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

@bstrie bstrie mentioned this pull request Sep 25, 2016
Closed
@bstrie
Copy link
Contributor

bstrie commented Sep 28, 2016

I believe this is now being addressed by #36222 , so I'll close this (feel free to reopen if I'm wrong). Thanks for the effort in any case! :)

@bstrie bstrie closed this Sep 28, 2016
@sophiajt sophiajt reopened this Sep 28, 2016
@sophiajt
Copy link
Contributor

@bstrie - neither PR has landed, yet. Though given that both haven't moved in over two weeks, perhaps we should close both?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@sophiajt sophiajt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@paulfanelli @rust-highfive @sophiajt @bors @bstrie @GuillaumeGomez