Skip to content

Update error format for E0458, E0459#36070

Merged
bors merged 2 commits intorust-lang:masterfrom
gavinb:master
Sep 4, 2016
Merged

Update error format for E0458, E0459#36070
bors merged 2 commits intorust-lang:masterfrom
gavinb:master

Conversation

@gavinb
Copy link
Contributor

@gavinb gavinb commented Aug 28, 2016

Fixes #35933, #35932
Part of #35233

r? @jonathandturner

@sophiajt
Copy link
Contributor

sophiajt commented Aug 28, 2016

Looks good! Thanks for the PR.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 28, 2016

📌 Commit 852953c has been approved by jonathandturner

@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 29, 2016
Closed
@sophiajt
Copy link
Contributor

sophiajt commented Aug 29, 2016

@gavinb - since you've been changing the same PR, I'd like to just go ahead and merge one. Can you change the title to show all of the errors you've updated?

bors added a commit that referenced this pull request Aug 29, 2016
@bors
Auto merge of #36090 - GuillaumeGomez:rollup, r=GuillaumeGomez
aee9774 
Rollup of 11 pull requests

- Successful merges: #35418, #35759, #35862, #35863, #35962, #35977, #35993, #35997, #36054, #36056, #36070
- Failed merges: #35771, #35810
@gavinb
Copy link
Contributor Author

gavinb commented Aug 31, 2016

@jonathandturner I didn't mean to change the same PR. I should have done the original changes on a separate branch and not rebased.

Since I have a PR for E0164, E0165 and E0184 as #36125 which has already gone in, I'll chop those off my master branch and re-push to clear up the overlap. (Somehow they ended up on master as well as a dev branch. Erk.)

@sophiajt
Copy link
Contributor

sophiajt commented Sep 2, 2016

This looks good. Let me know if it's ready, and I'll go ahead and approve.

@gavinb
Copy link
Contributor Author

gavinb commented Sep 3, 2016

Yes, ready to go as far as I'm concerned. Thanks.

@sophiajt
Copy link
Contributor

sophiajt commented Sep 3, 2016

Sounds good

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 3, 2016

📌 Commit 0412fa8 has been approved by jonathandturner

@Manishearth Manishearth mentioned this pull request Sep 4, 2016
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 4, 2016
@Manishearth
Rollup merge of rust-lang#36070 - gavinb:master, r=jonathandturner
2e1669f 
Update error format for E0458, E0459

Fixes rust-lang#35933, rust-lang#35932
Part of rust-lang#35233

r? @jonathandturner
bors added a commit that referenced this pull request Sep 4, 2016
@bors
Auto merge of #36255 - Manishearth:rollup, r=Manishearth
0e5c96b 
Rollup of 7 pull requests

- Successful merges: #36070, #36132, #36200, #36212, #36225, #36231, #36234
- Failed merges:
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 4, 2016
@Manishearth
Rollup merge of rust-lang#36070 - gavinb:master, r=jonathandturner
4b88915 
Update error format for E0458, E0459

Fixes rust-lang#35933, rust-lang#35932
Part of rust-lang#35233

r? @jonathandturner
bors added a commit that referenced this pull request Sep 4, 2016
@bors
Auto merge of #36255 - Manishearth:rollup, r=Manishearth
987b475 
Rollup of 7 pull requests

- Successful merges: #36070, #36132, #36200, #36212, #36225, #36231, #36234
- Failed merges:
@bors bors merged commit 0412fa8 into rust-lang:master Sep 4, 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.

3 participants

@gavinb @sophiajt @bors