about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorPulkit Goyal <7895pulkit@gmail.com>2018-01-27 13:28:09 +0530
committerPulkit Goyal <7895pulkit@gmail.com>2018-01-27 13:28:09 +0530
commit5ce2b0299784b337cbbbc1492086df577003b19c (patch)
tree80b1c657cd766836508125061175b0e198f3301e /src
parent566905030380151f90708fa340312c9ca2c6056c (diff)
downloadrust-5ce2b0299784b337cbbbc1492086df577003b19c.tar.gz
rust-5ce2b0299784b337cbbbc1492086df577003b19c.zip
don't mention tasks in stability warnings of #[thread_local] #47755
This is a fix for issue #47755.
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/feature_gate.rs4
-rw-r--r--src/test/ui/feature-gate-thread_local.stderr2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 5a7b53153fd..50f961c1db8 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -694,9 +694,7 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
     ("thread_local", Whitelisted, Gated(Stability::Unstable,
                                         "thread_local",
                                         "`#[thread_local]` is an experimental feature, and does \
-                                         not currently handle destructors. There is no \
-                                         corresponding `#[task_local]` mapping to the task \
-                                         model",
+                                         not currently handle destructors.",
                                         cfg_fn!(thread_local))),
 
     ("rustc_on_unimplemented", Normal, Gated(Stability::Unstable,
diff --git a/src/test/ui/feature-gate-thread_local.stderr b/src/test/ui/feature-gate-thread_local.stderr
index 0f932abe4ee..f7b05d5cf25 100644
--- a/src/test/ui/feature-gate-thread_local.stderr
+++ b/src/test/ui/feature-gate-thread_local.stderr
@@ -1,4 +1,4 @@
-error[E0658]: `#[thread_local]` is an experimental feature, and does not currently handle destructors. There is no corresponding `#[task_local]` mapping to the task model (see issue #29594)
+error[E0658]: `#[thread_local]` is an experimental feature, and does not currently handle destructors. (see issue #29594)
   --> $DIR/feature-gate-thread_local.rs:18:1
    |
 18 | #[thread_local] //~ ERROR `#[thread_local]` is an experimental feature