From a13db07b03b9edad390d5e384f1a0cfc85679a08 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Wed, 14 Jun 2017 14:16:51 +1000
Subject: [PATCH] Add back cargo-fmt binary (#1670)

When there are no `[[bin]]` sections, all the binaries in `src/bin` are
automatically picked up. When a section is added, that is no longer the
case, so all the binaries need to be specified explicitly.
---
 Cargo.toml      | 3 +++
 tests/system.rs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index a0da1d6b685..caf66bf4f74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,9 @@ doctest = false
 [[bin]]
 name = "rustfmt"
 
+[[bin]]
+name = "cargo-fmt"
+
 [features]
 default = ["cargo-fmt"]
 cargo-fmt = []
diff --git a/tests/system.rs b/tests/system.rs
index 970d9f0e2eb..a6b7536111f 100644
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate rustfmt;
+extern crate rustfmt_nightly as rustfmt;
 extern crate diff;
 extern crate regex;
 extern crate term;