Merge pull request #2602 from kinnison/fix-2601

Fix 2601

Author: kinnison

src/dist/dist.rs

@@ -730,12 +730,27 @@ fn try_update_from_dist_<'a>(
 
             let mut all_components: HashSet<Component> = profile_components.into_iter().collect();
 
+            let rust_package = m.get_package("rust")?;
+            let rust_target_package = rust_package.get_target(Some(&toolchain.target.clone()))?;
+
             for component in components.iter().copied() {
                 let mut component =
                     Component::new(component.to_string(), Some(toolchain.target.clone()), false);
                 if let Some(renamed) = m.rename_component(&component) {
                     component = renamed;
                 }
+                // Look up the newly constructed/renamed component and ensure that
+                // if it's a wildcard component we note such, otherwise we end up
+                // exacerbating the problem we thought we'd fixed with #2087 and #2115
+                if let Some(c) = rust_target_package
+                    .components
+                    .iter()
+                    .find(|c| c.short_name_in_manifest() == component.short_name_in_manifest())
+                {
+                    if c.target.is_none() {
+                        component = component.wildcard();
+                    }
+                }
                 all_components.insert(component);
             }
 

src/dist/manifestation.rs

@@ -617,8 +617,10 @@ impl Update {
                                 // It is the case, so we need to create a fresh wildcard
                                 // component using the package name and add it to the final
                                 // component list
-                                self.final_component_list
-                                    .push(existing_component.wildcard());
+                                let wildcarded = existing_component.wildcard();
+                                if !self.final_component_list.contains(&wildcarded) {
+                                    self.final_component_list.push(wildcarded);
+                                }
                             } else {
                                 self.missing_components.push(existing_component.clone());
                             }

tests/cli-v2.rs

@@ -1517,3 +1517,32 @@ fn install_allow_downgrade() {
         expect_component_executable(config, "rls");
     });
 }
+
+#[test]
+fn regression_2601() {
+    // We're checking that we don't regress per #2601
+    setup(&|config| {
+        expect_ok(
+            config,
+            &[
+                "rustup",
+                "toolchain",
+                "install",
+                "--profile",
+                "minimal",
+                "nightly",
+                "--component",
+                "rust-src",
+                "--no-self-update",
+            ],
+        );
+        // The bug exposed in #2601 was that the above would end up installing
+        // rust-src-$ARCH which would then have to be healed on the following
+        // command, resulting in a reinstallation.
+        expect_stderr_ok(
+            config,
+            &["rustup", "component", "add", "rust-src"],
+            "info: component 'rust-src' is up to date",
+        );
+    });
+}