Skip to content

Conversation

estebank
Copy link
Contributor

Fix #49100.

@estebank
Copy link
Contributor Author

r? @oli-obk

@estebank estebank added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2018
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

r= me with nit addressed

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.

Copy link
Contributor

Choose a reason for hiding this comment

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

travis is unhappy with this empty trailing line

@estebank
Copy link
Contributor Author

@bors r=oli-obk rollup

@bors
Copy link
Collaborator

bors commented Mar 19, 2018

📌 Commit 1b8f1fc has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 20, 2018
bors added a commit that referenced this pull request Mar 20, 2018
Rollup of 17 pull requests

- Successful merges: #46518, #48810, #48834, #48902, #49004, #49092, #49096, #49099, #49104, #49125, #49139, #49152, #49157, #49161, #49166, #49176, #49184
- Failed merges:
@bors
Copy link
Collaborator

bors commented Mar 20, 2018

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@bors bors merged commit 1b8f1fc into rust-lang:master Mar 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants