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 E0326 #35375

Merged
merged 1 commit into from
Aug 12, 2016
Merged

Update error format for E0326 #35375

merged 1 commit into from
Aug 12, 2016

Conversation

trixnz
Copy link
Contributor

@trixnz trixnz commented Aug 5, 2016

Fixes #35335 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 802b543 has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 5, 2016
Rollup merge of rust-lang#35375 - trixnz:update-error-326, r=jonathan…
36af476 
…dturner

Update error format for E0326

Fixes rust-lang#35335 as part of rust-lang#35233

r? @jonathandturner
@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
@eddyb
Copy link
Member

eddyb commented Aug 6, 2016

@bors r-

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
@KiChjang
Copy link
Member

KiChjang commented Aug 8, 2016 •
edited
Loading

Looks like there's a compile-fail failure in compile-fail/associated-const-impl-wrong-type.rs. You'll most probably need to make a rebase against master to incorporate the new changes from others.

@sophiajt
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 10, 2016

📌 Commit 034df94 has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 10, 2016
Rollup merge of rust-lang#35375 - trixnz:update-error-326, r=jonathan…
3da08f3 
…dturner

Update error format for E0326

Fixes rust-lang#35335 as part of rust-lang#35233

r? @jonathandturner
@sophiajt sophiajt mentioned this pull request Aug 10, 2016
Closed
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 11, 2016
Rollup merge of rust-lang#35375 - trixnz:update-error-326, r=jonathan…
e24c326 
…dturner

Update error format for E0326

Fixes rust-lang#35335 as part of rust-lang#35233

r? @jonathandturner
@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
@bors bors merged commit 034df94 into rust-lang:master Aug 12, 2016
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
@trixnz @rust-highfive @sophiajt @bors @eddyb @KiChjang