diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-03-17 08:48:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 08:48:52 -0400 |
| commit | dee6989b437c966a7cb0b3b6f572f71f529f282c (patch) | |
| tree | 288c144bebc972230914fd0e8a5ea34f7d4f940b /src/libstd/thread | |
| parent | 69717170a410cd8f3e9647c5f38c72eff59e4c72 (diff) | |
| parent | 97a1b6a055d69cf21faa9773133725bdfddc5196 (diff) | |
| download | rust-dee6989b437c966a7cb0b3b6f572f71f529f282c.tar.gz rust-dee6989b437c966a7cb0b3b6f572f71f529f282c.zip | |
Rollup merge of #40457 - frewsxcv:frewsxcv-macos, r=steveklabnik
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.rs | 6 |
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() { |