From: bors <bors@rust-lang.org>
Date: Wed, 26 Apr 2017 05:48:11 +0000 (+0000)
Subject: Auto merge of #3947 - matklad:bench-bench, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~66
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f27ca344d3b9019a87239c9f25fd290add84937;p=cargo.git

Auto merge of #3947 - matklad:bench-bench, r=alexcrichton

Allow test named `test`

Looks like `srt/test.rs` and `src/bench.rs` used to be default
integraion test and benchmark, but they no longer are.

closes #3932
---

0f27ca344d3b9019a87239c9f25fd290add84937