about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-03-12 14:13:35 -0400
committerCorey Farwell <coreyf@rwell.org>2017-03-12 14:59:04 -0400
commit97a1b6a055d69cf21faa9773133725bdfddc5196 (patch)
tree8d534c831bc269f5c839a34b2bd1766f47fc6994 /src/libstd/thread
parentf88b24b34c6d17ebe4014bec5a0f7c2a57c529c7 (diff)
downloadrust-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/thread')
-rw-r--r--src/libstd/thread/local.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index 66f09a7069c..e2b22b1d89f 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -74,7 +74,7 @@ use mem;
 ///    destroyed, but not all platforms have this guard. Those platforms that do
 ///    not guard typically have a synthetic limit after which point no more
 ///    destructors are run.
-/// 3. On OSX, initializing TLS during destruction of other TLS slots can
+/// 3. On macOS, initializing TLS during destruction of other TLS slots can
 ///    sometimes cancel *all* destructors for the current thread, whether or not
 ///    the slots have already had their destructors run or not.
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -524,9 +524,9 @@ mod tests {
     }
 
     // Note that this test will deadlock if TLS destructors aren't run (this
-    // requires the destructor to be run to pass the test). OSX has a known bug
+    // requires the destructor to be run to pass the test). macOS has a known bug
     // where dtors-in-dtors may cancel other destructors, so we just ignore this
-    // test on OSX.
+    // test on macOS.
     #[test]
     #[cfg_attr(target_os = "macos", ignore)]
     fn dtors_in_dtors_in_dtors() {