mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent panicking against directories or non-existent files

Browse Source
This commit is contained in:
Seiichi Uchida 2017-04-26 17:29:56 +09:00
parent b46c147fed
commit 4cec3ab71d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bin/rustfmt.rs
View File

@ -258,21 +258,29 @@ fn execute(opts: &Options) -> FmtResult<Summary> {
let mut error_summary = Summary::new();
for file in files {
// Check the file directory if the config-path could not be read or not provided
if path.is_none() {
let (config_tmp, path_tmp) = resolve_config(file.parent().unwrap())?;
if options.verbose {
if let Some(path) = path_tmp.as_ref() {
println!("Using rustfmt config file {} for {}",
path.display(),
file.display());
if !file.exists() {
println!("Error: file `{}` does not exist", file.to_str().unwrap());
error_summary.add_operational_error();
} else if file.is_dir() {
println!("Error: `{}` is a directory", file.to_str().unwrap());
error_summary.add_operational_error();
} else {
// Check the file directory if the config-path could not be read or not provided
if path.is_none() {
let (config_tmp, path_tmp) = resolve_config(file.parent().unwrap())?;
if options.verbose {
if let Some(path) = path_tmp.as_ref() {
println!("Using rustfmt config file {} for {}",
path.display(),
file.display());
}
}
config = config_tmp;
}
config = config_tmp;
}
options.clone().apply_to(&mut config);
error_summary.add(run(Input::File(file), &config));
options.clone().apply_to(&mut config);
error_summary.add(run(Input::File(file), &config));
}
}
Ok(error_summary)
}