From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 12 Feb 2018 16:31:48 +0000 (+0300)
Subject: Cleanup
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d48cbf6df3a19486bcc7f051d908f871db797cdc;p=cargo.git

Cleanup
---

diff --git a/src/bin/init.rs b/src/bin/init.rs
index 9252ddd39..4c3832e68 100644
--- a/src/bin/init.rs
+++ b/src/bin/init.rs
@@ -56,17 +56,16 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult {
 
     let path = &arg_path.unwrap_or_else(|| String::from("."));
     let opts = ops::NewOptions::new(flag_vcs,
-                                     flag_bin,
-                                     flag_lib,
-                                     path,
-                                     flag_name.as_ref().map(|s| s.as_ref()));
+                                    flag_bin,
+                                    flag_lib,
+                                    path,
+                                    flag_name.as_ref().map(|s| s.as_ref()));
 
     let opts_lib = opts.lib;
     ops::init(&opts, config)?;
 
-    config.shell().status("Created", format!("{} project",
-                                             if opts_lib { "library" }
-                                             else {"binary (application)"}))?;
+    let project_kind = if opts_lib { "library" } else { "binary (application)" };
+    config.shell().status("Created", format!("{} project", project_kind))?;
 
     Ok(())
 }
diff --git a/src/bin/new.rs b/src/bin/new.rs
index c006fd1e4..1e6342e2f 100644
--- a/src/bin/new.rs
+++ b/src/bin/new.rs
@@ -63,10 +63,8 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult {
     let opts_lib = opts.lib;
     ops::new(&opts, config)?;
 
-    config.shell().status("Created", format!("{} `{}` project",
-                                             if opts_lib { "library" }
-                                             else {"binary (application)"},
-                                             arg_path))?;
+    let project_kind = if opts_lib { "library" } else { "binary (application)" };
+    config.shell().status("Created", format!("{} `{}` project", project_kind, arg_path))?;
 
     Ok(())
 }
diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 83dc8d045..9fbb8f853 100644
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -62,25 +62,20 @@ impl<'de> Deserialize<'de> for VersionControl {
 
 impl<'a> NewOptions<'a> {
     pub fn new(version_control: Option<VersionControl>,
-           bin: bool,
-           lib: bool,
-           path: &'a str,
-           name: Option<&'a str>) -> NewOptions<'a> {
+               bin: bool,
+               lib: bool,
+               path: &'a str,
+               name: Option<&'a str>) -> NewOptions<'a> {
 
         // default to lib
-        let is_lib = if !bin {
-            true
-        }
-        else {
-            lib
-        };
+        let is_lib = !bin || lib;
 
         NewOptions {
-            version_control: version_control,
-            bin: bin,
+            version_control,
+            bin,
             lib: is_lib,
-            path: path,
-            name: name,
+            path,
+            name,
         }
     }
 }