From: bors <bors@rust-lang.org>
Date: Wed, 7 Jun 2017 15:42:07 +0000 (+0000)
Subject: Auto merge of #4138 - alexcrichton:fix-tests, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~8^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ceb23c46f99882da1d7a0694aebbbc944280829c;p=cargo.git

Auto merge of #4138 - alexcrichton:fix-tests, r=alexcrichton

Fix tests on beta

Had a few usages of `-Z` leak out of the nightly channel.
---

ceb23c46f99882da1d7a0694aebbbc944280829c