Inline `config_from_args`

diff --git a/src/bin/cli.rs b/src/bin/cli.rs
index 6894d3bb65d636f765c6d98d7b9425a889645816..0b6242e59fb45248762528a5767a73bc4a9f54c2 100644 (file)
--- a/src/bin/cli.rs
+++ b/src/bin/cli.rs
@@ -73,7 +73,14 @@ pub fn do_main(config: &mut Config) -> CliResult {
 }
 
 fn execute_subcommand(config: &mut Config, args: ArgMatches) -> CliResult {
-    config_from_args(config, &args)?;
+    config.configure(
+        args.occurrences_of("verbose") as u32,
+        if args.is_present("quite") { Some(true) } else { None },
+        &args.value_of("color").map(|s| s.to_string()),
+        args.is_present("frozen"),
+        args.is_present("locked"),
+        &args.values_of_lossy("unstable-features").unwrap_or_default(),
+    )?;
 
     match args.subcommand() {
         ("bench", Some(args)) => {

diff --git a/src/bin/command_prelude.rs b/src/bin/command_prelude.rs
index cc48bd3739672b1ac5e4e430f4d06c93cf9fb02c..d8a5fa7eb6527c57f5c08736e96e91684237c708 100644 (file)
--- a/src/bin/command_prelude.rs
+++ b/src/bin/command_prelude.rs
@@ -176,18 +176,6 @@ pub fn values(args: &ArgMatches, name: &str) -> Vec<String> {
 }
 
 
-pub fn config_from_args(config: &mut Config, args: &ArgMatches) -> CargoResult<()> {
-    let color = args.value_of("color").map(|s| s.to_string());
-    config.configure(
-        args.occurrences_of("verbose") as u32,
-        if args.is_present("quite") { Some(true) } else { None },
-        &color,
-        args.is_present("frozen"),
-        args.is_present("locked"),
-        &args.values_of_lossy("unstable-features").unwrap_or_default(),
-    )
-}
-
 pub fn root_manifest_from_args(config: &Config, args: &ArgMatches) -> CargoResult<PathBuf> {
     let manifest_path = args.value_of("manifest-path").map(|s| s.to_string());
     find_root_manifest_for_wd(manifest_path, config.cwd())