Merge pull request #3070 from practicalswift/syntax-fixes

[gardening] Fix some spacing inconsistencies.

Author: practicalswift

stdlib/public/SDK/Dispatch/Dispatch.mm

@@ -156,7 +156,7 @@ static void _dispatch_overlay_constructor() {
 // DISPATCH_RUNTIME_STDLIB_INTERFACE
 // extern "C" dispatch_queue_t
 // _swift_apply_current_root_queue() {
-// 	return DISPATCH_APPLY_CURRENT_ROOT_QUEUE;
+//   return DISPATCH_APPLY_CURRENT_ROOT_QUEUE;
 // }
 
 #define SOURCE(t)                                                              \

stdlib/public/SDK/Foundation/Boxing.swift

@@ -69,7 +69,7 @@ internal enum _MutableUnmanagedWrapper<ImmutableType : NSObject, MutableType : N
 
 internal protocol _SwiftNativeFoundationType : class {
     associatedtype ImmutableType : NSObject
-    associatedtype MutableType : NSObject,  NSMutableCopying
+    associatedtype MutableType : NSObject, NSMutableCopying
     var __wrapped : _MutableUnmanagedWrapper<ImmutableType, MutableType> { get }
 
     init(unmanagedImmutableObject: Unmanaged<ImmutableType>)

stdlib/public/SDK/Foundation/DataThunks.m

@@ -19,13 +19,13 @@
 extern const NSDataDeallocator NSDataDeallocatorNone;
 
 void __NSDataInvokeDeallocatorVM(void *mem, NSUInteger length) {
-	NSDataDeallocatorVM(mem, length);
+  NSDataDeallocatorVM(mem, length);
 }
 
 void __NSDataInvokeDeallocatorUnmap(void *mem, NSUInteger length) {
-	NSDataDeallocatorUnmap(mem, length);
+  NSDataDeallocatorUnmap(mem, length);
 }
 
 void __NSDataInvokeDeallocatorFree(void *mem, NSUInteger length) {
-	NSDataDeallocatorFree(mem, length);
+  NSDataDeallocatorFree(mem, length);
 }

stdlib/public/SDK/Foundation/Notification.swift

@@ -50,7 +50,7 @@ public struct Notification : ReferenceConvertible, Equatable, Hashable {
     }
 
     public var description: String {
-        return "name = \(name.rawValue),  object = \(object), userInfo = \(userInfo)"
+        return "name = \(name.rawValue), object = \(object), userInfo = \(userInfo)"
     }
 
     public var debugDescription: String {

stdlib/public/SDK/Foundation/NotificationThunks.m

@@ -17,15 +17,15 @@
     NSString *NS_RELEASES_ARGUMENT __nonnull name,
     id NS_RELEASES_ARGUMENT __nullable object,
     NSDictionary *NS_RELEASES_ARGUMENT __nullable userInfo) {
-	NSNotification *notif = [[NSNotification alloc] initWithName:name object:object userInfo:userInfo];
-	[name release];
-	[object release];
-	[userInfo release];
-	return notif;
+  NSNotification *notif = [[NSNotification alloc] initWithName:name object:object userInfo:userInfo];
+  [name release];
+  [object release];
+  [userInfo release];
+  return notif;
 }
 
 extern NS_RETURNS_RETAINED __nullable id
 __NSNotificationUserInfo(
-	NSNotification *NS_RELEASES_ARGUMENT __nonnull notif) {
-	return [notif.userInfo retain]; // avoid the copy here since this is fetching the stored dictionary and copying it might destroy it's type
-}
+  NSNotification *NS_RELEASES_ARGUMENT __nonnull notif) {
+  return [notif.userInfo retain]; // avoid the copy here since this is fetching the stored dictionary and copying it might destroy it's type
+}

stdlib/public/SDK/XPC/XPC.mm

@@ -15,27 +15,27 @@
 __attribute__((visibility("hidden")))
 extern "C" xpc_type_t
 _swift_xpc_get_type(xpc_object_t object) {
-	return xpc_get_type(object);
+  return xpc_get_type(object);
 }
 
 __attribute__((visibility("hidden")))
 extern "C" xpc_object_t
 _swift_xpc_bool_true() {
-	return XPC_BOOL_TRUE;
+  return XPC_BOOL_TRUE;
 }
 
 __attribute__((visibility("hidden")))
 extern "C" xpc_object_t
 _swift_xpc_bool_false() {
-	return XPC_BOOL_FALSE;
+  return XPC_BOOL_FALSE;
 }
 
 #define TYPE(t) \
-	__attribute__((visibility("hidden"))) \
-	extern "C" xpc_type_t \
-	_swift_xpc_type_##t(void) { \
-		return XPC_TYPE_##t; \
-	}
+  __attribute__((visibility("hidden"))) \
+  extern "C" xpc_type_t \
+  _swift_xpc_type_##t(void) { \
+    return XPC_TYPE_##t; \
+  }
 
 TYPE(CONNECTION)
 TYPE(ENDPOINT)
@@ -58,17 +58,17 @@
 __attribute__((visibility("hidden")))
 extern "C" xpc_object_t
 _swift_xpc_connection_interrupted(void) {
-	return XPC_ERROR_CONNECTION_INTERRUPTED;
+  return XPC_ERROR_CONNECTION_INTERRUPTED;
 }
 
 __attribute__((visibility("hidden")))
 extern "C" xpc_object_t
 _swift_xpc_connection_invalid(void) {
-	return XPC_ERROR_CONNECTION_INVALID;
+  return XPC_ERROR_CONNECTION_INVALID;
 }
 
 __attribute__((visibility("hidden")))
 extern "C" xpc_object_t
 _swift_xpc_connection_termination_imminent(void) {
-	return XPC_ERROR_TERMINATION_IMMINENT;
+  return XPC_ERROR_TERMINATION_IMMINENT;
 }

test/1_stdlib/Intents.swift

@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
-// Intents is only public on OSX and iOS
+// Intents is only public on OS X and iOS
 // UNSUPPORTED: OS=watchos OS=tvos
 
 // FIXME: un-XFAIL the test once the build bots have been updated to the