Merge pull request swiftlang#2143 from practicalswift/osx

[gardening] "OSX" → "OS X"

Author: practicalswift

apinotes/README.md

@@ -44,7 +44,7 @@ Swift compiler itself need not be recompiled except in rare cases
 where the changes affect how the SDK overlays are built. To recompile
 API notes for a given module `$MODULE` and place them into their 
 
-### OSX
+### OS X
 ```
 xcrun swift -apinotes -yaml-to-binary -target x86_64-apple-macosx10.10 -o $SWIFT_EXEC/lib/swift/macosx/$MODULE.apinotesc $MODULE.apinotes
 ```

cmake/modules/FindUUID.cmake

@@ -8,7 +8,7 @@ find_path(UUID_INCLUDE_DIR uuid/uuid.h
     HINTS ${PC_UUID_INCLUDEDIR} ${PC_UUID_INCLUDE_DIRS})
 set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
 
-# On OSX we don't need the library
+# On OS X we don't need the library
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   set(UUID_REQUIRED UUID_INCLUDE_DIR)
 else()

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -381,7 +381,7 @@ macro(swift_common_cxx_warnings)
   check_cxx_compiler_flag("-Werror -Woverloaded-virtual" CXX_SUPPORTS_OVERLOADED_VIRTUAL)
   append_if(CXX_SUPPORTS_OVERLOADED_VIRTUAL "-Woverloaded-virtual" CMAKE_CXX_FLAGS)
 
-  # Check for '-fapplication-extension'.  On OSX/iOS we wish to link all
+  # Check for '-fapplication-extension'.  On OS X/iOS we wish to link all
   # dynamic libraries with this flag.
   check_cxx_compiler_flag("-fapplication-extension" CXX_SUPPORTS_FAPPLICATION_EXTENSION)
 endmacro()

docs/ErrorHandling.rst

@@ -726,7 +726,7 @@ more likely, we'd need to wrap them all in an overlay.
 
 In both cases, it is possible to pull these into the Swift error
 handling model, but because this is likely to require massive SDK
-annotations it is considered out of scope for iOS 9/OSX 10.11 & Swift 2.0.
+annotations it is considered out of scope for iOS 9/OS X 10.11 & Swift 2.0.
 
 Unexpected and universal errors
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

include/swift/AST/AvailabilitySpec.h

@@ -56,7 +56,7 @@ class AvailabilitySpec {
 };
 
 /// \brief An availability specification that guards execution based on the
-/// run-time platform and version, e.g., OSX >= 10.10.
+/// run-time platform and version, e.g., OS X >= 10.10.
 class VersionConstraintAvailabilitySpec : public AvailabilitySpec {
   PlatformKind Platform;
   SourceLoc PlatformLoc;

include/swift/AST/PlatformKind.h

@@ -46,10 +46,10 @@ StringRef prettyPlatformString(PlatformKind platform);
 
 /// Returns whether the passed-in platform is active, given the language
 /// options. A platform is active if either it is the target platform or its
-/// AppExtension variant is the target platform. For example, OSX is
-/// considered active when the target operating system is OSX and app extension
+/// AppExtension variant is the target platform. For example, OS X is
+/// considered active when the target operating system is OS X and app extension
 /// restrictions are enabled, but OSXApplicationExtension is not considered
-/// active when the target platform is OSX and app extension restrictions are
+/// active when the target platform is OS X and app extension restrictions are
 /// disabled. PlatformKind::none is always considered active.
 bool isPlatformActive(PlatformKind Platform, LangOptions &LangOpts);
 

lib/Sema/TypeChecker.cpp

@@ -1346,7 +1346,7 @@ class TypeRefinementContextBuilder : private ASTWalker {
 
       // FIXME: This is not quite right: we want to handle AppExtensions
       // properly. For example, on the OSXApplicationExtension platform
-      // we want to chose the OSX spec unless there is an explicit
+      // we want to chose the OS X spec unless there is an explicit
       // OSXApplicationExtension spec.
       if (isPlatformActive(VersionSpec->getPlatform(), TC.getLangOpts())) {
         return VersionSpec;

test/SILGen/inherited_protocol_conformance_multi_file_2.swift

@@ -14,7 +14,7 @@
 // baC
 // RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_C
 
-// OSX 10.9
+// OS X 10.9
 // RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_C
 // cAb
 // RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_A

test/Sema/deprecation_osx.swift

@@ -152,7 +152,7 @@ func callMethodInDeprecatedExtension() {
 func functionWithDeprecatedMethodInDeadElseBranch() {
   if #available(iOS 8.0, *) {
   } else {
-    // This branch is dead on OSX, so we shouldn't emit a deprecation warning in it.
+    // This branch is dead on OS X, so we shouldn't emit a deprecation warning in it.
     let _ = ClassDeprecatedIn10_9()  // no-warning
   }
 
@@ -163,7 +163,7 @@ func functionWithDeprecatedMethodInDeadElseBranch() {
   }
 
   guard #available(iOS 8.0, *) else {
-    // This branch is dead because our platform is OSX, so the wildcard always matches.
+    // This branch is dead because our platform is OS X, so the wildcard always matches.
     let _ = ClassDeprecatedIn10_9()  // no-warning
   }
 }

utils/build-presets.ini

@@ -404,7 +404,7 @@ build-subdir=buildbot_incremental
 release
 assertions
 
-# We run the OSX tests and validation tests.
+# We run the OS X tests and validation tests.
 test
 validation-test