Make component removal best-effort and preserve single-error behavior

Author: Inconnu08

src/cli/rustup_mode.rs

@@ -1483,15 +1483,16 @@ async fn component_remove(
 
     let mut parsed_components = Vec::new();
     let mut unknown_components = Vec::new();
+    // Preserve the original UnknownComponent error to keep
+    // single-component error behavior unchanged
+    let mut first_unknown_component_error = None;
     let mut first_error = None;
 
     for component in &components {
         match Component::try_new(component, &distributable, target.as_ref()) {
-            Ok(new_component) => parsed_components.push((new_component, component.clone())),
+            Ok(new_component) => parsed_components.push((new_component, component)),
             Err(err) => {
-                if first_error.is_none() {
-                    first_error = Some(err);
-                }
+                first_error.get_or_insert(err);
             }
         }
     }
@@ -1501,22 +1502,25 @@ async fn component_remove(
             if let Some(RustupError::UnknownComponent { suggestion, .. }) =
                 err.downcast_ref::<RustupError>()
             {
-                unknown_components.push((original_name, suggestion.clone()));
+                unknown_components.push((original_name.clone(), suggestion.clone()));
+                first_unknown_component_error.get_or_insert(err);
                 continue;
             }
 
-            if first_error.is_none() {
-                first_error = Some(err);
-            }
+            first_error.get_or_insert(err);
         }
     }
 
-    if !unknown_components.is_empty() {
-        return Err(RustupError::UnknownComponents {
-            desc: distributable.desc().clone(),
-            components: unknown_components,
+    match unknown_components.len() {
+        0 => {}
+        1 => return Err(first_unknown_component_error.expect("missing first unknown error")),
+        _ => {
+            return Err(RustupError::UnknownComponents {
+                desc: distributable.desc().clone(),
+                components: unknown_components,
+            }
+            .into());
         }
-        .into());
     }
 
     if let Some(err) = first_error {

tests/suite/cli_v2.rs

@@ -2180,7 +2180,7 @@ async fn remove_component_suggest_best_match() {
         .expect(["rustup", "component", "remove", "rsl"])
         .await
         .with_stderr(snapbox::str![[r#"
-error: toolchain 'nightly-[HOST_TRIPLE]' does not contain component 'rsl'; did you mean 'rls'?
+error: toolchain 'nightly-[HOST_TRIPLE]' does not contain component 'rsl' for target '[HOST_TRIPLE]'; did you mean 'rls'?
 
 "#]])
         .is_err();
@@ -2200,7 +2200,7 @@ error: toolchain 'nightly-[HOST_TRIPLE]' does not contain component 'rsl-preview
         .expect(["rustup", "component", "remove", "rustd"])
         .await
         .with_stderr(snapbox::str![[r#"
-error: toolchain 'nightly-[HOST_TRIPLE]' does not contain component 'rustd'; did you mean 'rustc'?
+error: toolchain 'nightly-[HOST_TRIPLE]' does not contain component 'rustd' for target '[HOST_TRIPLE]'; did you mean 'rustc'?
 
 "#]])
         .is_err();