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 compiler error 0030 to use new error format. #35415

Merged
merged 1 commit into from
Aug 17, 2016
Merged

Update compiler error 0030 to use new error format. #35415

merged 1 commit into from
Aug 17, 2016

Conversation

silenuss
Copy link
Contributor

@silenuss silenuss commented Aug 6, 2016

Part of #35233,
Addresses #35204

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.

@silenuss silenuss changed the title Update compiler error 0029 to use new error format. Update compiler error 0030 to use new error format. Aug 6, 2016
@sophiajt
Copy link
Contributor

sophiajt commented Aug 6, 2016

Looks good!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 6, 2016

📌 Commit 2d614f4 has been approved by jonathandturner

@bors
Copy link
Contributor

bors commented Aug 6, 2016

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

@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
bors added a commit that referenced this pull request Aug 14, 2016
@bors
Auto merge of #35666 - eddyb:rollup, r=eddyb
13ff307 
Rollup of 30 pull requests

- Successful merges: #34941, #35392, #35444, #35447, #35491, #35533, #35539, #35558, #35573, #35574, #35577, #35586, #35588, #35594, #35596, #35597, #35598, #35606, #35611, #35615, #35616, #35620, #35622, #35640, #35643, #35644, #35646, #35647, #35648, #35661
- Failed merges: #35395, #35415
@silenuss
Copy link
Contributor Author

Sorry, I've been on vacation all week so I couldn't get to this. I've fixed the conflicts so things should be all good again!

@silenuss
Copy link
Contributor Author

r? @jonathandturner

@sophiajt
Copy link
Contributor

Thanks for updating!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 15, 2016

📌 Commit fa61f82 has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 17, 2016
Rollup merge of rust-lang#35415 - silenuss:e0030-formatting, r=jonath…
7ec253f 
…andturner

Update compiler error 0030 to use new error format.

Part of rust-lang#35233,
Addresses rust-lang#35204

r? @jonathandturner
@sophiajt sophiajt mentioned this pull request Aug 17, 2016
Closed
bors added a commit that referenced this pull request Aug 17, 2016
@bors
Auto merge of #35743 - jonathandturner:rollup, r=jonathandturner
b28ffa5 
Rollup of 24 pull requests

- Successful merges: #34370, #35415, #35595, #35610, #35613, #35614, #35621, #35660, #35663, #35670, #35671, #35672, #35681, #35686, #35690, #35691, #35695, #35707, #35708, #35713, #35722, #35725, #35726, #35731
- Failed merges: #35395
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 17, 2016
Rollup merge of rust-lang#35415 - silenuss:e0030-formatting, r=jonath…
d3f55e1 
…andturner

Update compiler error 0030 to use new error format.

Part of rust-lang#35233,
Addresses rust-lang#35204

r? @jonathandturner
@sophiajt sophiajt mentioned this pull request Aug 17, 2016
Merged
bors added a commit that referenced this pull request Aug 17, 2016
@bors
Auto merge of #35747 - jonathandturner:rollup, r=jonathandturner
7ac11ca 
Rollup of 23 pull requests

- Successful merges: #34370, #35415, #35595, #35610, #35613, #35614, #35621, #35660, #35663, #35670, #35671, #35672, #35681, #35686, #35690, #35695, #35707, #35708, #35713, #35722, #35725, #35726, #35731
- Failed merges: #35395
@bors bors merged commit fa61f82 into rust-lang:master Aug 17, 2016
@silenuss silenuss mentioned this pull request Aug 19, 2016
Closed
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.
4 participants
@silenuss @rust-highfive @sophiajt @bors