From aeaf3f1480ac4fe4491823f964bdf0e91bbba38d Mon Sep 17 00:00:00 2001
From: Anup Dhamala <anupdhml+git@gmail.com>
Date: Mon, 27 Apr 2020 17:53:31 -0400
Subject: [PATCH] Respect xargo override from toml

---
 src/main.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8100d998c..aad231a42 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -249,14 +249,12 @@ fn run() -> Result<ExitStatus> {
             }
 
             let available_targets = rustup::available_targets(&toolchain, verbose)?;
-            let uses_xargo = !target.is_builtin() ||
-                !available_targets.contains(&target) ||
-                if let Some(toml) = toml.as_ref() {
-                    toml.xargo(&target)?
-                } else {
-                    None
-                }
-                .unwrap_or(false);
+            let uses_xargo = if let Some(toml) = toml.as_ref() {
+                toml.xargo(&target)?
+            } else {
+                None
+            }
+            .unwrap_or_else(|| !target.is_builtin() || !available_targets.contains(&target));
 
             if !uses_xargo && !available_targets.is_installed(&target) {
                 rustup::install(&target, &toolchain, verbose)?;