nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-07 06:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2237 from topecongiro/issue-2131

Browse Source 
Do not pass files as arguments to rustfmt when dumping the default config
This commit is contained in:
Nick Cameron 2017-12-05 16:53:00 +13:00 committed by GitHub
commit 38d2fb4ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/cargo-fmt.rs
View File

@ -134,7 +134,12 @@ fn format_crate(
verbosity: Verbosity,
strategy: &CargoFmtStrategy,
) -> Result<ExitStatus, io::Error> {
let targets = get_targets(strategy)?;
let rustfmt_args = get_fmt_args();
let targets = if rustfmt_args.iter().any(|s| s == "--dump-default-config") {
HashSet::new()
} else {
get_targets(strategy)?
};
// Currently only bin and lib files get formatted
let files: Vec<_> = targets
@ -147,7 +152,7 @@ fn format_crate(
.map(|t| t.path)
.collect();
format_files(&files, &get_fmt_args(), verbosity)
format_files(&files, &rustfmt_args, verbosity)
}
fn get_fmt_args() -> Vec<String> {