From 397a18076a95f2644618a7cb3fb3ba0c9dcecd6e Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 18 Sep 2024 09:20:22 -0500
Subject: [PATCH] fix(complete): Fallback to rustc if rustup fails for --target
 completions

If there is any problem with rustup, we should fallback to rustc.

(this also removes some extra allocations)
---
 src/cargo/util/command_prelude.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
index 6bb219bcf..c13105cc6 100644
--- a/src/cargo/util/command_prelude.rs
+++ b/src/cargo/util/command_prelude.rs
@@ -1123,11 +1123,13 @@ fn get_target_triples() -> Vec<clap_complete::CompletionCandidate> {
 
     if is_rustup() {
         if let Ok(targets) = get_target_triples_from_rustup() {
-            candidates.extend(targets);
+            candidates = targets;
         }
-    } else {
+    }
+
+    if candidates.is_empty() {
         if let Ok(targets) = get_target_triples_from_rustc() {
-            candidates.extend(targets);
+            candidates = targets;
         }
     }