r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

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

r=me with a rebase

@bors r=alexcrichton

Now also fixes openbsd and bitrig.

📌 Commit a7cd514 has been approved by alexcrichton

⌛ Testing commit a7cd514 with merge e5aa92a...

💔 Test failed - auto-mac-32-opt

@bors: retry

On Thu, Nov 26, 2015 at 9:23 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-32-opt
http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/7258

—
Reply to this email directly or view it on GitHub
#30071 (comment).

⚡ Previous build results for auto-linux-cross-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-msvc-32-opt are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-musl-64-opt, auto-mac-32-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-64-opt...

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt