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

Use edition in rustfmt.toml when no command line argument is passed

Browse Source
This commit is contained in:
Seiichi Uchida 2018-10-29 22:53:29 +09:00
parent 1f64f4012f
commit 6fa804deba
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, emit_mode: EmitMode,
backup: bool, backup: bool,
check: bool, check: bool,
edition: Edition, edition: Option<Edition>,
color: Option<Color>, color: Option<Color>,
file_lines: FileLines, // Default is all lines in all files. file_lines: FileLines, // Default is all lines in all files.
unstable_features: bool, unstable_features: bool,
@ -503,7 +503,7 @@ impl GetOptsOptions {
} }
if let Some(ref edition_str) = matches.opt_str("edition") { 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") { if matches.opt_present("backup") {
@ -559,7 +559,9 @@ impl CliOptions for GetOptsOptions {
if let Some(error_on_unformatted) = self.error_on_unformatted { if let Some(error_on_unformatted) = self.error_on_unformatted {
config.set().error_on_unformatted(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 { if self.check {
config.set().emit_mode(EmitMode::Diff); config.set().emit_mode(EmitMode::Diff);
} else { } else {