diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 15:29:51 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 15:45:15 -0800 |
| commit | d2f990f2b0a5a6bdc0834ab8e8ea17bb5212efee (patch) | |
| tree | b0f0c941332106bfa8c771e76f7601838b94f990 /src/libstd/sys/common | |
| parent | adcda460115b1f491a7624752901b7410591dfc5 (diff) | |
| download | rust-d2f990f2b0a5a6bdc0834ab8e8ea17bb5212efee.tar.gz rust-d2f990f2b0a5a6bdc0834ab8e8ea17bb5212efee.zip | |
More test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/thread_local.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index ef682902dfc..905fac07c5d 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -140,6 +140,7 @@ pub const INIT: StaticKey = StaticKey { /// Constant initialization value for the inner part of static TLS keys. /// /// This value allows specific configuration of the destructor for a TLS key. +#[stable(feature = "rust1", since = "1.0.0")] pub const INIT_INNER: StaticKeyInner = StaticKeyInner { key: atomic::ATOMIC_USIZE_INIT, }; |