Skip to content

Update E0116 to new error code format. - #35467

Merged
bors merged 1 commit into
rust-lang:masterfrom
terryxsun:master
Aug 7, 2016
Merged

Update E0116 to new error code format.#35467
bors merged 1 commit into
rust-lang:masterfrom
terryxsun:master

Conversation

@terryxsun

@terryxsunterryxsun commented Aug 7, 2016

Copy link
Copy Markdown
Contributor

Fixes#35249 as part of #35233.

r? @jonathandturner

@rust-highfive

rust-highfive commented Aug 7, 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 @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
sophiajt reviewed Aug 7, 2016
View reviewed changes
Comment threadsrc/librustc_typeck/coherence/orphan.rs Outdated

@sophiajtsophiajtAug 7, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you remove the "; define and implement a trait or new type instead" from the error title?

@sophiajt

sophiajt commented Aug 7, 2016

Copy link
Copy Markdown
Contributor

Thanks for the PR!

This looks really close. I made a comment on the one part that still needs to be updated. After that, squash down to 1 commit, and I think we'll be ready to go.

@terryxsun

terryxsun commented Aug 7, 2016

Copy link
Copy Markdown
ContributorAuthor

Got it!

@sophiajt

sophiajt commented Aug 7, 2016

Copy link
Copy Markdown
Contributor

Looks good!

@bors r+ rollup

@bors

bors commented Aug 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 03dc484 has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 7, 2016
Jonathan Turner
Rollup merge ofrust-lang#35467- terrynsun:master, r=jonathandturner
8bd8cef
Update E0116 to new error code format.
Fixesrust-lang#35249 as part of rust-lang#35233.
r? @jonathandturner
@sophiajtsophiajt mentioned this pull request Aug 7, 2016
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
@bors
bors merged commit 03dc484 into rust-lang:masterAug 7, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@sophiajtsophiajt

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@terryxsun@rust-highfive@sophiajt@bors