Auto merge of #47800 - Pulkit07:issue47755, r=sfackler

don't mention tasks in stability warnings of #[thread_local] #47755

This is a fix for issue #47755.
This commit is contained in:
bors 2018-01-28 16:17:18 +00:00
commit 771873c841
2 changed files with 2 additions and 4 deletions

View File

@ -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,

View File

@ -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