Skip to content

Add a few diagnostic messages - #25255

Merged
bors merged 2 commits into
rust-lang:masterfrom
caipre:diagnostic-messages
May 10, 2015
Merged

Add a few diagnostic messages#25255
bors merged 2 commits into
rust-lang:masterfrom
caipre:diagnostic-messages

Conversation

@caipre

@caiprecaipre commented May 10, 2015

Copy link
Copy Markdown
Contributor

Add a few diagnostic messages; part of #24407.

@rust-highfive

rust-highfive commented May 10, 2015

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 @pcwalton (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. 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 CONTRIBUTING.md for more information.

@alexcrichton

alexcrichton commented May 10, 2015

Copy link
Copy Markdown
Member

@bors: r+ 41f2e5c rollup

Thanks!

@ManishearthManishearth mentioned this pull request May 10, 2015
Merged
bors added a commit that referenced this pull request May 10, 2015
@bors
Auto merge of#25262- Manishearth:rollup, r=Manishearth
750f2c6
- Successful merges: #25200, #25242, #25248, #25249, #25251, #25252, #25261
- Failed merges: #25255
@bors

bors commented May 10, 2015

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bors

bors commented May 10, 2015

Copy link
Copy Markdown
Collaborator

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

@caipre

caipre commented May 10, 2015

Copy link
Copy Markdown
ContributorAuthor

rebased

@alexcrichton

alexcrichton commented May 10, 2015

Copy link
Copy Markdown
Member

@bors: r+ ffc0d04

steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 10, 2015
@steveklabnik
Rollup merge ofrust-lang#25255- caipre:diagnostic-messages, r=alexc…
39a25cf
…richton
Add a few diagnostic messages; part of rust-lang#24407.
@steveklabniksteveklabnik mentioned this pull request May 10, 2015
Closed
bors added a commit that referenced this pull request May 10, 2015
@bors
Auto merge of#25275- steveklabnik:rollup, r=steveklabnik
d9ec142
- Successful merges: #24948, #25085, #25158, #25188, #25239, #25240, #25241, #25255, #25257, #25263, #25271
- Failed merges:
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 10, 2015
@steveklabnik
Rollup merge ofrust-lang#25255- caipre:diagnostic-messages, r=alexc…
5160bf8
…richton
Add a few diagnostic messages; part of rust-lang#24407.
@steveklabniksteveklabnik mentioned this pull request May 10, 2015
Merged
bors added a commit that referenced this pull request May 10, 2015
@bors
Auto merge of#25281- steveklabnik:rollup, r=steveklabnik
9ecc989
- Successful merges: #24948, #25158, #25188, #25222, #25239, #25240, #25241, #25255, #25257, #25263
- Failed merges:
@bors
bors merged commit ffc0d04 into rust-lang:masterMay 10, 2015
@caipre
caipre deleted the diagnostic-messages branch July 11, 2015 02:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@caipre@rust-highfive@alexcrichton@bors@pcwalton