config: Use PartialConfig for verbose and skip_children

Author: kamalmarhubi

src/bin/rustfmt.rs

@@ -96,9 +96,16 @@ fn resolve_config(dir: &Path) -> io::Result<(Config, Option<PathBuf>)> {
     Ok((Config::from(parsed_config), Some(path)))
 }
 
-fn update_config(config: &mut Config, matches: &Matches) {
-    config.verbose = matches.opt_present("verbose");
-    config.skip_children = matches.opt_present("skip-children");
+fn partial_config_from_options(matches: &Matches) -> PartialConfig {
+    let mut config = PartialConfig::new();
+    if matches.opt_present("skip_children") {
+        config.skip_children = Some(true);
+    }
+    if matches.opt_present("verbose") {
+        config.verbose = Some(true);
+    }
+
+    config
 }
 
 fn execute() -> i32 {
@@ -156,13 +163,13 @@ fn execute() -> i32 {
                 let (mut config, path) = resolve_config(file.parent().unwrap())
                                              .expect(&format!("Error resolving config for {}",
                                                               file.display()));
+                config = config.merge(&partial_config_from_options(&matches));
                 if let Some(path) = path {
                     println!("Using rustfmt config file {} for {}",
                              path.display(),
                              file.display());
                 }
 
-                update_config(&mut config, &matches);
                 run(&file, write_mode, &config);
             }
             0