Merge pull request #1671 from robinst/add-cargo-fmt-binary

Add back cargo-fmt binary

Cargo.toml

@@ -17,6 +17,9 @@ doctest = false
 [[bin]]
 name = "rustfmt"
 
+[[bin]]
+name = "cargo-fmt"
+
 [features]
 default = ["cargo-fmt"]
 cargo-fmt = []

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;