Stabilize -Clink-self-contained=[+-]linker

Author: Kobzol

compiler/rustc_session/src/config.rs

@@ -362,9 +362,20 @@ impl LinkSelfContained {
     /// components was set individually. This would also require the `-Zunstable-options` flag, to
     /// be allowed.
     fn are_unstable_variants_set(&self) -> bool {
-        let any_component_set =
-            !self.enabled_components.is_empty() || !self.disabled_components.is_empty();
-        self.explicitly_set.is_none() && any_component_set
+        if self.explicitly_set.is_some() {
+            return false;
+        }
+
+        let mentioned_components = self.enabled_components.union(self.disabled_components);
+        for component in LinkSelfContainedComponents::all() {
+            if mentioned_components.contains(component) {
+                // Only the linker component is stable now
+                if component != LinkSelfContainedComponents::LINKER {
+                    return true;
+                }
+            }
+        }
+        false
     }
 
     /// Returns whether the self-contained linker component was enabled on the CLI, using the
@@ -2531,7 +2542,7 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
             cg.link_self_contained.are_unstable_variants_set();
         if uses_unstable_self_contained_option {
             early_dcx.early_fatal(
-                "only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off` are stable, \
+                "only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker`/`+linker` are stable, \
                 the `-Z unstable-options` flag must also be passed to use the unstable values",
             );
         }

tests/run-make/compressed-debuginfo-zstd/rmake.rs

@@ -28,7 +28,6 @@ fn prepare_and_check<F: FnOnce(&mut Rustc) -> &mut Rustc>(to_find: &str, prepare
         rustc
             .arg("-Clinker-features=+lld")
             .arg("-Clink-self-contained=+linker")
-            .arg("-Zunstable-options")
             .arg("-Cdebuginfo=full")
             .input("main.rs");
         prepare_rustc(&mut rustc).run();

tests/run-make/rust-lld/rmake.rs

@@ -11,11 +11,7 @@ fn main() {
     // Opt-in to lld and the self-contained linker, to link with rust-lld. We'll check that by
     // asking the linker to display its version number with a link-arg.
     assert_rustc_uses_lld(
-        rustc()
-            .arg("-Clinker-features=+lld")
-            .arg("-Clink-self-contained=+linker")
-            .arg("-Zunstable-options")
-            .input("main.rs"),
+        rustc().arg("-Clinker-features=+lld").arg("-Clink-self-contained=+linker").input("main.rs"),
     );
 
     // It should not be used when we explicitly opt-out of lld.
@@ -26,7 +22,6 @@ fn main() {
     assert_rustc_uses_lld(
         rustc()
             .arg("-Clink-self-contained=+linker")
-            .arg("-Zunstable-options")
             .arg("-Clinker-features=-lld")
             .arg("-Clinker-features=+lld")
             .arg("-Clinker-features=-lld,+lld")

tests/ui/linking/link-self-contained-consistency.rs

@@ -3,7 +3,7 @@
 
 //@ check-fail
 //@ revisions: one many
-//@ [one] compile-flags: -Clink-self-contained=-linker -Clink-self-contained=+linker -Zunstable-options
+//@ [one] compile-flags: -Clink-self-contained=-linker -Clink-self-contained=+linker
 //@ [many] compile-flags: -Clink-self-contained=+linker,+crto -Clink-self-contained=-linker,-crto -Zunstable-options
 // ignore-tidy-linelength