From: bors <bors@rust-lang.org>
Date: Mon, 19 Jun 2017 14:09:30 +0000 (+0000)
Subject: Auto merge of #4181 - gilescope:patch-1, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~8^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ae4124859411cc7db36d2b07ea9fba7068a43b36;p=cargo.git

Auto merge of #4181 - gilescope:patch-1, r=alexcrichton

Make test less brittle prior to assert_eq failure message format change

PR required for rust-lang/rust#42541 to make assert_eq error message be multi-line. Before implementing this we need to make the current test less brittle.
Not 100% clear on if I need the final [...] or not.
---

ae4124859411cc7db36d2b07ea9fba7068a43b36