Merge pull request #2895 from practicalswift/normalize-syntax

[gardening] Normalize formatting. Use "OS X" instead of "OSX".

Author: lattner

lib/IDE/Formatting.cpp

@@ -504,7 +504,7 @@ class FormatWalker : public SourceEntityWalker {
       if (auto TE = dyn_cast_or_null<TupleExpr>(Node.dyn_cast<Expr *>())) {
         // Trailing closures are not considered siblings to other args.
         unsigned EndAdjust = TE->hasTrailingClosure() ? 1 : 0;
-        for (unsigned I = 0, N = TE->getNumElements() - EndAdjust; I < N; I ++) {
+        for (unsigned I = 0, N = TE->getNumElements() - EndAdjust; I < N; I++) {
           auto EleStart = TE->getElementNameLoc(I);
           if (EleStart.isInvalid()) {
             EleStart = TE->getElement(I)->getStartLoc();

utils/build-script-impl

@@ -109,7 +109,7 @@ KNOWN_SETTINGS=(
     skip-build-linux            ""               "set to skip building Swift stdlibs for Linux"
     skip-build-freebsd          ""               "set to skip building Swift stdlibs for FreeBSD"
     skip-build-cygwin           ""               "set to skip building Swift stdlibs for Cygwin"
-    skip-build-osx              ""               "set to skip building Swift stdlibs for OSX"
+    skip-build-osx              ""               "set to skip building Swift stdlibs for OS X"
     skip-build-ios-device       ""               "set to skip building Swift stdlibs for iOS devices (i.e. build simulators only)"
     skip-build-ios-simulator    ""               "set to skip building Swift stdlibs for iOS simulators (i.e. build devices only)"
     skip-build-tvos-device      ""               "set to skip building Swift stdlibs for tvOS devices (i.e. build simulators only)"
@@ -135,7 +135,7 @@ KNOWN_SETTINGS=(
     skip-test-linux             ""               "set to skip testing Swift stdlibs for Linux"
     skip-test-freebsd           ""               "set to skip testing Swift stdlibs for FreeBSD"
     skip-test-cygwin            ""               "set to skip testing Swift stdlibs for Cygwin"
-    skip-test-osx               ""               "set to skip testing Swift stdlibs for OSX"
+    skip-test-osx               ""               "set to skip testing Swift stdlibs for OS X"
     skip-test-ios-simulator     ""               "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)"
     skip-test-ios-host          ""               "set to skip testing the host parts of the iOS toolchain"
     skip-test-tvos-simulator    ""               "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)"
@@ -2718,7 +2718,7 @@ function build_and_test_installable_package() {
         echo "--- Creating installable package ---"
         echo "-- Package file: ${package_for_host} --"
 
-        # Assume the lipo builds are (or include) an OSX host and build an xctoolchain
+        # Assume the lipo builds are (or include) an OS X host and build an xctoolchain
         if [[ "${host}" == "macosx-"* ]] || [[ "${host}" == "merged-hosts" ]]; then
           copy_swift_stdlib_tool_substitute "${host_install_destdir}${host_install_prefix}/bin/swift-stdlib-tool"