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 Error format for E0516, E0517, E0518 #36128

Merged
merged 3 commits into from
Sep 7, 2016
Merged

Update Error format for E0516, E0517, E0518 #36128

merged 3 commits into from
Sep 7, 2016

Conversation

gavinb
Copy link
Contributor

@gavinb gavinb commented Aug 30, 2016

@bors
Copy link
Contributor

bors commented Aug 30, 2016

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

@sophiajt
Copy link
Contributor

Looks good. Once you fix the merge conflict, it should be ready.

@gavinb
Copy link
Contributor Author

gavinb commented Sep 3, 2016

@jonathandturner Merge conflict resolved, ready to go.

@sophiajt
Copy link
Contributor

sophiajt commented Sep 3, 2016

Looks good

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 3, 2016

📌 Commit 361626b has been approved by jonathandturner

@bors
Copy link
Contributor

bors commented Sep 3, 2016

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

@gavinb
Copy link
Contributor Author

gavinb commented Sep 5, 2016

@jonathandturner updated again to resolve merge conflict.

@sophiajt
Copy link
Contributor

sophiajt commented Sep 5, 2016

Great, looks good.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 5, 2016

📌 Commit cd56d47 has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 6, 2016
Rollup merge of rust-lang#36128 - gavinb:error_msgs_p2, r=jonathandtu…
f03886e 
…rner

Update Error format for E0516, E0517, E0518

- E0518 Update error format rust-lang#36111
- E0517 Update error format rust-lang#36109
- E0516 Update error format rust-lang#36108
- Part of rust-lang#35233

r? @jonathandturner
@sophiajt sophiajt mentioned this pull request Sep 6, 2016
Closed
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 6, 2016
Rollup merge of rust-lang#36128 - gavinb:error_msgs_p2, r=jonathandtu…
4f74f83 
…rner

Update Error format for E0516, E0517, E0518

- E0518 Update error format rust-lang#36111
- E0517 Update error format rust-lang#36109
- E0516 Update error format rust-lang#36108
- Part of rust-lang#35233

r? @jonathandturner
@sophiajt sophiajt mentioned this pull request Sep 6, 2016
Merged
bors added a commit that referenced this pull request Sep 6, 2016
@bors
Auto merge of #36303 - jonathandturner:rollup, r=jonathandturner
3b272bf 
Rollup of 8 pull requests

- Successful merges: #36121, #36128, #36241, #36243, #36263, #36267, #36273, #36298
- Failed merges:
@bors bors merged commit cd56d47 into rust-lang:master Sep 7, 2016
@gavinb gavinb deleted the error_msgs_p2 branch September 7, 2016 03:13
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.
3 participants
@gavinb @bors @sophiajt