diff options
Diffstat (limited to 'src/libstd/thread_local/mod.rs')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index e2e8461ea54..029b8bf1138 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -115,7 +115,7 @@ macro_rules! thread_local( use std::cell::UnsafeCell as __UnsafeCell; use std::thread_local::KeyInner as __KeyInner; use std::option::Option as __Option; - use std::option::None as __None; + use std::option::Option::None as __None; __thread_local_inner!(static __KEY: __UnsafeCell<__Option<$t>> = { __UnsafeCell { value: __None } @@ -132,7 +132,7 @@ macro_rules! thread_local( use std::cell::UnsafeCell as __UnsafeCell; use std::thread_local::KeyInner as __KeyInner; use std::option::Option as __Option; - use std::option::None as __None; + use std::option::Option::None as __None; __thread_local_inner!(static __KEY: __UnsafeCell<__Option<$t>> = { __UnsafeCell { value: __None } @@ -198,7 +198,7 @@ macro_rules! __thread_local_inner( inner: ::std::cell::UnsafeCell { value: $init }, os: ::std::thread_local::OsStaticKey { inner: ::std::thread_local::OS_INIT_INNER, - dtor: ::std::option::Some(__destroy), + dtor: ::std::option::Option::Some(__destroy), }, } }; |