squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #3152 from topecongiro/do-not-override-edition-in-rustfmt-toml

Browse source 
Use edition in rustfmt.toml when no command line argument is passed
This commit is contained in:
Nick Cameron 2018-10-31 13:31:24 +13:00 committed by GitHub
commit 2c471a559f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bin/main.rs
View file

@ -438,7 +438,7 @@ struct GetOptsOptions {
emit_mode: EmitMode,
backup: bool,
check: bool,
edition: Edition,
edition: Option<Edition>,
color: Option<Color>,
file_lines: FileLines, // Default is all lines in all files.
unstable_features: bool,
@ -503,7 +503,7 @@ impl GetOptsOptions {
}
if let Some(ref edition_str) = matches.opt_str("edition") {
options.edition = edition_from_edition_str(edition_str)?;
options.edition = Some(edition_from_edition_str(edition_str)?);
}
if matches.opt_present("backup") {
@ -559,7 +559,9 @@ impl CliOptions for GetOptsOptions {
if let Some(error_on_unformatted) = self.error_on_unformatted {
config.set().error_on_unformatted(error_on_unformatted);
}
config.set().edition(self.edition);
if let Some(edition) = self.edition {
config.set().edition(edition);
}
if self.check {
config.set().emit_mode(EmitMode::Diff);
} else {