From 660f41865b43f38d68b649328c04b1702e37655e Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Fri, 28 Aug 2015 10:28:28 +0200 Subject: [PATCH 1/3] Only exit after running all destructors and flushing stdout --- src/bin/rustfmt.rs | 62 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs index eda3eba107c..e57ba18614d 100644 --- a/src/bin/rustfmt.rs +++ b/src/bin/rustfmt.rs @@ -10,7 +10,6 @@ #![feature(path_ext)] #![feature(rustc_private)] #![cfg(not(test))] -#![feature(result_expect)] #[macro_use] extern crate log; @@ -52,8 +51,11 @@ fn lookup_and_read_project_file() -> io::Result<(PathBuf, String)> { Ok((path, toml)) } -fn main() { - let (args, write_mode) = determine_params(std::env::args()); +fn execute() -> i32 { + let (args, write_mode) = match determine_params(std::env::args()) { + Some((args, write_mode)) => (args, write_mode), + None => return 1, + }; let config = match lookup_and_read_project_file() { Ok((path, toml)) => { @@ -64,15 +66,26 @@ fn main() { }; run(args, write_mode, Box::new(config)); - std::process::exit(0); + 0 } -fn usage>(reason: S) { - print!("{}\n\r usage: rustfmt [-h Help] [--write-mode=[true/false]] ", reason.into()); - std::process::exit(1); +fn main() { + use std::io::Write; + let exit_code = execute(); + // Make sure standard output is flushed before we exit + std::io::stdout().flush().unwrap(); + // Exit with given exit code. + // + // NOTE: This immediately terminates the process without doing any cleanup, + // so make sure to finish all necessary cleanup before this is called. + std::process::exit(exit_code); } -fn determine_params(args: I) -> (Vec, WriteMode) +fn print_usage>(reason: S) { + println!("{}\n\r usage: rustfmt [-h Help] [--write-mode=[true/false]] ", reason.into()); +} + +fn determine_params(args: I) -> Option<(Vec, WriteMode)> where I: Iterator { let arg_prefix = "-"; @@ -80,27 +93,38 @@ fn determine_params(args: I) -> (Vec, WriteMode) let help_mode = "-h"; let long_help_mode = "--help"; let mut write_mode = WriteMode::Replace; + let args: Vec = args.collect(); // The NewFile option currently isn't supported because it requires another // parameter, but it can be added later. - let args:Vec = args.filter(|arg| { + if args.iter().any(|arg| { if arg.starts_with(write_mode_prefix) { - write_mode = FromStr::from_str(&arg[write_mode_prefix.len()..]).expect("Unrecognized write mode"); + write_mode = match FromStr::from_str(&arg[write_mode_prefix.len()..]) { + Ok(mode) => mode, + Err(_) => { + print_usage("Unrecognized write mode"); + return true; + } + }; false } else if arg.starts_with(help_mode) || arg.starts_with(long_help_mode) { - usage(""); - false - } else if arg.starts_with(arg_prefix) { - usage("Invalid argument"); - false - } else { + print_usage(""); true + } else if arg.starts_with(arg_prefix) { + print_usage("Invalid argument"); + true + } else { + false } - }).collect(); + }) { + return None; + } + if args.len() < 2 { - usage("Please provide a file to be formatted"); + print_usage("Please provide a file to be formatted"); + return None; } - (args, write_mode) + Some((args, write_mode)) } From ce2516545018bf146ec1c898531eed942bb42da7 Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Fri, 28 Aug 2015 13:07:08 +0200 Subject: [PATCH 2/3] Don't pass --write-mode argument to rustc Fixes regression introduced by 660f41865b43f38d68b649328c04b1702e37655e --- src/bin/rustfmt.rs | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs index e57ba18614d..c527ae1504a 100644 --- a/src/bin/rustfmt.rs +++ b/src/bin/rustfmt.rs @@ -93,38 +93,36 @@ fn determine_params(args: I) -> Option<(Vec, WriteMode)> let help_mode = "-h"; let long_help_mode = "--help"; let mut write_mode = WriteMode::Replace; - let args: Vec = args.collect(); + let mut rustc_args = Vec::new(); // The NewFile option currently isn't supported because it requires another // parameter, but it can be added later. - if args.iter().any(|arg| { + for arg in args { if arg.starts_with(write_mode_prefix) { - write_mode = match FromStr::from_str(&arg[write_mode_prefix.len()..]) { - Ok(mode) => mode, + match FromStr::from_str(&arg[write_mode_prefix.len()..]) { + Ok(mode) => write_mode = mode, Err(_) => { print_usage("Unrecognized write mode"); - return true; + return None; } - }; - false + } } else if arg.starts_with(help_mode) || arg.starts_with(long_help_mode) { print_usage(""); - true + return None; } else if arg.starts_with(arg_prefix) { print_usage("Invalid argument"); - true + return None; } else { - false + // Pass everything else to rustc + rustc_args.push(arg); } - }) { - return None; } - if args.len() < 2 { + if rustc_args.len() < 2 { print_usage("Please provide a file to be formatted"); return None; } - Some((args, write_mode)) + Some((rustc_args, write_mode)) } From 1f974fca014b0538422dfe42fd97723d832384aa Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Fri, 28 Aug 2015 23:51:26 +0200 Subject: [PATCH 3/3] Simplify match expression --- src/bin/rustfmt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs index c527ae1504a..2dc0168aa7f 100644 --- a/src/bin/rustfmt.rs +++ b/src/bin/rustfmt.rs @@ -53,7 +53,7 @@ fn lookup_and_read_project_file() -> io::Result<(PathBuf, String)> { fn execute() -> i32 { let (args, write_mode) = match determine_params(std::env::args()) { - Some((args, write_mode)) => (args, write_mode), + Some(params) => params, None => return 1, };