diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-03-12 14:13:35 -0400 |
|---|---|---|
| committer | Corey Farwell <coreyf@rwell.org> | 2017-03-12 14:59:04 -0400 |
| commit | 97a1b6a055d69cf21faa9773133725bdfddc5196 (patch) | |
| tree | 8d534c831bc269f5c839a34b2bd1766f47fc6994 /src/libstd/sys/redox/fast_thread_local.rs | |
| parent | f88b24b34c6d17ebe4014bec5a0f7c2a57c529c7 (diff) | |
| download | rust-97a1b6a055d69cf21faa9773133725bdfddc5196.tar.gz rust-97a1b6a055d69cf21faa9773133725bdfddc5196.zip | |
Update usages of 'OSX' (and other old names) to 'macOS'.
As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.
Diffstat (limited to 'src/libstd/sys/redox/fast_thread_local.rs')
| -rw-r--r-- | src/libstd/sys/redox/fast_thread_local.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/redox/fast_thread_local.rs b/src/libstd/sys/redox/fast_thread_local.rs index 6eeae2d90ea..f6414673dac 100644 --- a/src/libstd/sys/redox/fast_thread_local.rs +++ b/src/libstd/sys/redox/fast_thread_local.rs @@ -96,17 +96,17 @@ pub unsafe extern fn destroy_value<T>(ptr: *mut u8) { // `None`. (*ptr).dtor_running.set(true); - // The OSX implementation of TLS apparently had an odd aspect to it + // The macOS implementation of TLS apparently had an odd aspect to it // where the pointer we have may be overwritten while this destructor // is running. Specifically if a TLS destructor re-accesses TLS it may // trigger a re-initialization of all TLS variables, paving over at // least some destroyed ones with initial values. // - // This means that if we drop a TLS value in place on OSX that we could + // This means that if we drop a TLS value in place on macOS that we could // revert the value to its original state halfway through the // destructor, which would be bad! // - // Hence, we use `ptr::read` on OSX (to move to a "safe" location) + // Hence, we use `ptr::read` on macOS (to move to a "safe" location) // instead of drop_in_place. if cfg!(target_os = "macos") { ptr::read((*ptr).inner.get()); |
