Merge pull request #710 from JanLikar/master

[rust.git] / src / bin / cargo-fmt.rs

diff --git a/src/bin/cargo-fmt.rs b/src/bin/cargo-fmt.rs
index f79899ff5b1b8ccb034a0a0e54c975d51d4ef752..58d5e4d8d0f32a1e9a7dac25b4e45e6e9a855941 100644 (file)
--- a/src/bin/cargo-fmt.rs
+++ b/src/bin/cargo-fmt.rs
@@ -46,7 +46,7 @@ fn main() {
 fn print_usage(opts: &Options, reason: &str) {
     let msg = format!("{}\nusage: cargo fmt [options]", reason);
     println!("{}\nThis utility formats all bin and lib files of the current crate using rustfmt. \
-              Arguments after `--` are passes to rustfmt.",
+              Arguments after `--` are passed to rustfmt.",
              opts.usage(&msg));
 }
 
@@ -69,11 +69,8 @@ fn format_crate(opts: &Options) {
 }
 
 fn get_fmt_args() -> Vec<String> {
-    let mut args = vec!["--write-mode=overwrite".to_string()];
     // All arguments after -- are passed to rustfmt
-    args.extend(env::args().skip_while(|a| a != "--").skip(1));
-
-    args
+    env::args().skip_while(|a| a != "--").skip(1).collect()
 }
 
 #[derive(Debug)]