This should be fine to merge when ready, after merging to master you'll want to push the stable branch, and when that's done I can do the rigamarole of publishing the release

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

@bors r+

📌 Commit 4bbd51e has been approved by Diggsey

⌛ Testing commit 4bbd51e with merge d4958de...

@alexcrichton we currently have two failing bors tests (powerpc64le and netbsd) both of which appear to be caused by rustc issues. Is that going to be a problem?

powerpc64le issue is basically: rust-lang/rust#50499
It will be fixed in next stable (1.28).

NetBSD is more tricky, setvbuf should be available in system libc. Maybe bot is too old?

💔 Test failed - status-travis

@alexcrichton I've merged and pushed to stable anyway

Ok! It's probably fine to drop some of those platforms

Ok published now!

Thanks!