about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-04-03 22:55:03 +0200
committerGitHub <noreply@github.com>2020-04-03 22:55:03 +0200
commit17a59fb29cc2b2144a61b475375695190f08ffae (patch)
tree85c4aca99dc9a8dc59aa4a26501e586f3a585f1b
parent9b22fdc121abfd860e2b7c753aa254f2bf29a1a8 (diff)
parentd2ad9f445380958cf1d314c959dd5695bbf0b283 (diff)
downloadrust-17a59fb29cc2b2144a61b475375695190f08ffae.tar.gz
rust-17a59fb29cc2b2144a61b475375695190f08ffae.zip
Rollup merge of #70576 - Rustin-Liu:rustin-patch-link-cfg, r=varkor
Update the description of the ticket to point at RFC 1721

Fixes #70538.

My first PR to rust. So please let me know if I'm doing something wrong.
-rw-r--r--src/librustc_metadata/native_libs.rs9
-rw-r--r--src/test/ui/feature-gates/feature-gate-link_cfg.stderr2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs
index e952051eb9f..4b92a2205c2 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/src/librustc_metadata/native_libs.rs
@@ -162,8 +162,13 @@ impl Collector<'tcx> {
             }
         }
         if lib.cfg.is_some() && !self.tcx.features().link_cfg {
-            feature_err(&self.tcx.sess.parse_sess, sym::link_cfg, span.unwrap(), "is unstable")
-                .emit();
+            feature_err(
+                &self.tcx.sess.parse_sess,
+                sym::link_cfg,
+                span.unwrap(),
+                "kind=\"link_cfg\" is unstable",
+            )
+            .emit();
         }
         if lib.kind == cstore::NativeStaticNobundle && !self.tcx.features().static_nobundle {
             feature_err(
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
index 10b151ffa75..41a7dfc3f37 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
+++ b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
@@ -1,4 +1,4 @@
-error[E0658]: is unstable
+error[E0658]: kind="link_cfg" is unstable
   --> $DIR/feature-gate-link_cfg.rs:1:1
    |
 LL | #[link(name = "foo", cfg(foo))]