Merge pull request #2083 from practicalswift/unjustified-spacing

[gardening] Fix unjustified spacing

Author: practicalswift

benchmark/single-source/DictTest.swift

@@ -161,7 +161,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/DictTest2.swift

@@ -52,7 +52,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/DictTest3.swift

@@ -59,7 +59,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/DictionaryRemove.swift

@@ -57,7 +57,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/DictionarySwap.swift

@@ -60,7 +60,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/Hanoi.swift

@@ -28,7 +28,7 @@ class TowersOfHanoi {
   // Record all moves made.
   var moves : [Move] = [Move]()
 
-  func solve(_ n: Int,  start: String,  auxiliary: String,  end: String) {
+  func solve(_ n: Int, start: String, auxiliary: String, end: String) {
     if (n == 1) {
       moves.append(Move(from:start, to:end))
     } else {

benchmark/single-source/RGBHistogram.swift

@@ -126,7 +126,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

benchmark/single-source/SetTests.swift

@@ -119,7 +119,7 @@ class Box<T : Hashable where T : Equatable> : Hashable {
 extension Box : Equatable {
 }
 
-func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
+func ==<T: Equatable>(lhs: Box<T>, rhs: Box<T>) -> Bool {
   return lhs.value == rhs.value
 }
 

docs/ABI.rst

@@ -1177,7 +1177,7 @@ associated substitution index. Otherwise, the entity is mangled normally, and
 it is then added to the substitution map and associated with the next
 available substitution index.
 
-For example,  in mangling a function type
+For example, in mangling a function type
 ``(zim.zang.zung, zim.zang.zung, zim.zippity) -> zim.zang.zoo`` (with module
 ``zim`` and class ``zim.zang``),
 the recurring contexts ``zim``, ``zim.zang``, and ``zim.zang.zung``

include/swift/AST/Attr.def

@@ -203,7 +203,7 @@ DECL_ATTR(__raw_doc_comment, RawDocComment, OnAnyDecl |
           NotSerialized | RejectByParser, /* Not serialized */48)
 
 // Also handles unowned and unowned(weak).
-DECL_ATTR(weak,    Ownership, OnVar | OnParam | DeclModifier | NotSerialized,
+DECL_ATTR(weak, Ownership, OnVar | OnParam | DeclModifier | NotSerialized,
           /* Not serialized */49)
 DECL_ATTR_ALIAS(unowned, Ownership)
 

include/swift/Runtime/RuntimeFunctions.def

@@ -55,18 +55,18 @@ FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(AllocBox, swift_allocBox,
          ARGS(TypeMetadataPtrTy),
          ATTRS(NoUnwind))
 
-FUNCTION(DeallocBox,     swift_deallocBox,    DefaultCC,
+FUNCTION(DeallocBox, swift_deallocBox, DefaultCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))
 
-FUNCTION(ProjectBox,     swift_projectBox,    DefaultCC,
+FUNCTION(ProjectBox, swift_projectBox, DefaultCC,
          RETURNS(OpaquePtrTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind, ReadNone))
 
 // RefCounted *swift_allocObject(Metadata *type, size_t size, size_t alignMask);
-FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(AllocObject,    swift_allocObject,
+FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(AllocObject, swift_allocObject,
          _swift_allocObject, _swift_allocObject_, RegisterPreservingCC,
          RETURNS(RefCountedPtrTy),
          ARGS(TypeMetadataPtrTy, SizeTy, SizeTy),
@@ -86,25 +86,25 @@ FUNCTION(VerifyEndOfLifetime, swift_verifyEndOfLifetime, DefaultCC,
          ATTRS(NoUnwind))
 
 // void swift_deallocObject(HeapObject *obj, size_t size, size_t alignMask);
-FUNCTION(DeallocObject,  swift_deallocObject, RegisterPreservingCC,
+FUNCTION(DeallocObject, swift_deallocObject, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy, SizeTy, SizeTy),
          ATTRS(NoUnwind))
 
 // void swift_deallocClassInstance(HeapObject *obj, size_t size, size_t alignMask);
-FUNCTION(DeallocClassInstance,  swift_deallocClassInstance, DefaultCC,
+FUNCTION(DeallocClassInstance, swift_deallocClassInstance, DefaultCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy, SizeTy, SizeTy),
          ATTRS(NoUnwind))
 
 // void swift_deallocPartialClassInstance(HeapObject *obj, HeapMetadata *type, size_t size, size_t alignMask);
-FUNCTION(DeallocPartialClassInstance,  swift_deallocPartialClassInstance, DefaultCC,
+FUNCTION(DeallocPartialClassInstance, swift_deallocPartialClassInstance, DefaultCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy, TypeMetadataPtrTy, SizeTy, SizeTy),
          ATTRS(NoUnwind))
 
 // void *swift_slowAlloc(size_t size, size_t alignMask);
-FUNCTION(SlowAlloc,      swift_slowAlloc,     RegisterPreservingCC,
+FUNCTION(SlowAlloc, swift_slowAlloc, RegisterPreservingCC,
          RETURNS(Int8PtrTy),
          ARGS(SizeTy, SizeTy),
          ATTRS(NoUnwind))
@@ -134,21 +134,21 @@ FUNCTION(UnexpectedError, swift_unexpectedError, DefaultCC,
          ATTRS(NoUnwind, NoReturn))
 
 // void *swift_copyPOD(void *dest, void *src, Metadata *self);
-FUNCTION(CopyPOD,        swift_copyPOD,       DefaultCC,
+FUNCTION(CopyPOD, swift_copyPOD, DefaultCC,
          RETURNS(OpaquePtrTy),
          ARGS(OpaquePtrTy, OpaquePtrTy, TypeMetadataPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_retain(void *ptr);
 FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeStrongRetain, swift_retain,
-         _swift_retain,  _swift_retain_,  RegisterPreservingCC,
+         _swift_retain,  _swift_retain_, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_release(void *ptr);
 FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeStrongRelease, swift_release,
-         _swift_release, _swift_release_,  RegisterPreservingCC,
+         _swift_release, _swift_release_, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))
@@ -162,7 +162,7 @@ FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeStrongRetainN, swift_retain_n,
 
 // void swift_release_n(void *ptr, int32_t n);
 FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeStrongReleaseN, swift_release_n,
-         _swift_release_n, _swift_release_n_,  RegisterPreservingCC,
+         _swift_release_n, _swift_release_n_, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy, Int32Ty),
          ATTRS(NoUnwind))
@@ -183,7 +183,7 @@ FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeNonAtomicStrongRetainN, swift_nonatom
 
 // void swift_nonatomic_release_n(void *ptr, int32_t n);
 FUNCTION_WITH_GLOBAL_SYMBOL_AND_IMPL(NativeNonAtomicStrongReleaseN, swift_nonatomic_release_n,
-         _swift_nonatomic_release_n, _swift_nonatomic_release_n_,  RegisterPreservingCC,
+         _swift_nonatomic_release_n, _swift_nonatomic_release_n_, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy, Int32Ty),
          ATTRS(NoUnwind))
@@ -358,7 +358,7 @@ FUNCTION(ErrorStrongRelease, swift_errorRelease, DefaultCC,
          ATTRS(NoUnwind))
 
 // void swift_unownedRetain(void *ptr);
-FUNCTION(NativeUnownedRetain,  swift_unownedRetain, RegisterPreservingCC,
+FUNCTION(NativeUnownedRetain, swift_unownedRetain, RegisterPreservingCC,
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))
@@ -397,19 +397,19 @@ FUNCTION(NativeStrongRetainAndUnownedRelease,
          ATTRS(NoUnwind))
 
 // void swift_weakDestroy(WeakReference *object);
-FUNCTION(NativeWeakDestroy,    swift_weakDestroy,   DefaultCC,
+FUNCTION(NativeWeakDestroy, swift_weakDestroy, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_weakInit(WeakReference *object, void *value);
-FUNCTION(NativeWeakInit,       swift_weakInit,      DefaultCC,
+FUNCTION(NativeWeakInit, swift_weakInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, RefCountedPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_weakAssign(WeakReference *object, void *value);
-FUNCTION(NativeWeakAssign,     swift_weakAssign,    DefaultCC,
+FUNCTION(NativeWeakAssign, swift_weakAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, RefCountedPtrTy),
          ATTRS(NoUnwind))
@@ -427,43 +427,43 @@ FUNCTION(NativeWeakTakeStrong, swift_weakTakeStrong,DefaultCC,
          ATTRS(NoUnwind))
 
 // void swift_weakCopyInit(WeakReference *dest, WeakReference *src);
-FUNCTION(NativeWeakCopyInit,   swift_weakCopyInit,  DefaultCC,
+FUNCTION(NativeWeakCopyInit, swift_weakCopyInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_weakTakeInit(WeakReference *dest, WeakReference *src);
-FUNCTION(NativeWeakTakeInit,   swift_weakTakeInit,  DefaultCC,
+FUNCTION(NativeWeakTakeInit, swift_weakTakeInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_weakCopyAssign(WeakReference *dest, WeakReference *src);
-FUNCTION(NativeWeakCopyAssign, swift_weakCopyAssign,DefaultCC,
+FUNCTION(NativeWeakCopyAssign, swift_weakCopyAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_weakTakeAssign(WeakReference *dest, WeakReference *src);
-FUNCTION(NativeWeakTakeAssign, swift_weakTakeAssign,DefaultCC,
+FUNCTION(NativeWeakTakeAssign, swift_weakTakeAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakDestroy(WeakReference *object);
-FUNCTION(UnknownWeakDestroy,    swift_unknownWeakDestroy,   DefaultCC,
+FUNCTION(UnknownWeakDestroy, swift_unknownWeakDestroy, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakInit(WeakReference *object, void *value);
-FUNCTION(UnknownWeakInit,       swift_unknownWeakInit,      DefaultCC,
+FUNCTION(UnknownWeakInit, swift_unknownWeakInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, UnknownRefCountedPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakAssign(WeakReference *object, void *value);
-FUNCTION(UnknownWeakAssign,     swift_unknownWeakAssign,    DefaultCC,
+FUNCTION(UnknownWeakAssign, swift_unknownWeakAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, UnknownRefCountedPtrTy),
          ATTRS(NoUnwind))
@@ -481,79 +481,79 @@ FUNCTION(UnknownWeakTakeStrong, swift_unknownWeakTakeStrong,DefaultCC,
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakCopyInit(WeakReference *dest, WeakReference *src);
-FUNCTION(UnknownWeakCopyInit,   swift_unknownWeakCopyInit,  DefaultCC,
+FUNCTION(UnknownWeakCopyInit, swift_unknownWeakCopyInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakTakeInit(WeakReference *dest, WeakReference *src);
-FUNCTION(UnknownWeakTakeInit,   swift_unknownWeakTakeInit,  DefaultCC,
+FUNCTION(UnknownWeakTakeInit, swift_unknownWeakTakeInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakCopyAssign(WeakReference *dest, WeakReference *src);
-FUNCTION(UnknownWeakCopyAssign, swift_unknownWeakCopyAssign,DefaultCC,
+FUNCTION(UnknownWeakCopyAssign, swift_unknownWeakCopyAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownWeakTakeAssign(WeakReference *dest, WeakReference *src);
-FUNCTION(UnknownWeakTakeAssign, swift_unknownWeakTakeAssign,DefaultCC,
+FUNCTION(UnknownWeakTakeAssign, swift_unknownWeakTakeAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(WeakReferencePtrTy, WeakReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedDestroy(UnownedReference *object);
-FUNCTION(UnknownUnownedDestroy,    swift_unknownUnownedDestroy,   DefaultCC,
+FUNCTION(UnknownUnownedDestroy, swift_unknownUnownedDestroy, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedInit(UnownedReference *object, void *value);
-FUNCTION(UnknownUnownedInit,       swift_unknownUnownedInit,      DefaultCC,
+FUNCTION(UnknownUnownedInit, swift_unknownUnownedInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnknownRefCountedPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedAssign(UnownedReference *object, void *value);
-FUNCTION(UnknownUnownedAssign,     swift_unknownUnownedAssign,    DefaultCC,
+FUNCTION(UnknownUnownedAssign, swift_unknownUnownedAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnknownRefCountedPtrTy),
          ATTRS(NoUnwind))
 
 // void *swift_unknownUnownedLoad(UnownedReference *object);
-FUNCTION(UnknownUnownedLoadStrong, swift_unknownUnownedLoadStrong,DefaultCC,
+FUNCTION(UnknownUnownedLoadStrong, swift_unknownUnownedLoadStrong, DefaultCC,
          RETURNS(UnknownRefCountedPtrTy),
          ARGS(UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void *swift_unknownUnownedTake(UnownedReference *object);
-FUNCTION(UnknownUnownedTakeStrong, swift_unknownUnownedTakeStrong,DefaultCC,
+FUNCTION(UnknownUnownedTakeStrong, swift_unknownUnownedTakeStrong, DefaultCC,
          RETURNS(UnknownRefCountedPtrTy),
          ARGS(UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedCopyInit(UnownedReference *dest, UnownedReference *src);
-FUNCTION(UnknownUnownedCopyInit,   swift_unknownUnownedCopyInit,  DefaultCC,
+FUNCTION(UnknownUnownedCopyInit, swift_unknownUnownedCopyInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedTakeInit(UnownedReference *dest, UnownedReference *src);
-FUNCTION(UnknownUnownedTakeInit,   swift_unknownUnownedTakeInit,  DefaultCC,
+FUNCTION(UnknownUnownedTakeInit, swift_unknownUnownedTakeInit, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedCopyAssign(UnownedReference *dest, UnownedReference *src);
-FUNCTION(UnknownUnownedCopyAssign, swift_unknownUnownedCopyAssign,DefaultCC,
+FUNCTION(UnknownUnownedCopyAssign, swift_unknownUnownedCopyAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnownedReferencePtrTy),
          ATTRS(NoUnwind))
 
 // void swift_unknownUnownedTakeAssign(UnownedReference *dest, UnownedReference *src);
-FUNCTION(UnknownUnownedTakeAssign, swift_unknownUnownedTakeAssign,DefaultCC,
+FUNCTION(UnknownUnownedTakeAssign, swift_unknownUnownedTakeAssign, DefaultCC,
          RETURNS(VoidTy),
          ARGS(UnownedReferencePtrTy, UnownedReferencePtrTy),
          ATTRS(NoUnwind))

lib/IRGen/GenMeta.cpp

@@ -999,7 +999,7 @@ namespace {
 
     /// Set the metatype in local data.
     llvm::Value *setLocal(CanType type, llvm::Instruction *metatype) {
-      IGF.setScopedLocalTypeData(type,  LocalTypeDataKind::forTypeMetadata(),
+      IGF.setScopedLocalTypeData(type, LocalTypeDataKind::forTypeMetadata(),
                                  metatype);
       return metatype;
     }

lib/IRGen/IRGenFunction.cpp

@@ -36,7 +36,7 @@ IRGenFunction::IRGenFunction(IRGenModule &IGM,
                              const SILDebugScope *DbgScope,
                              Optional<SILLocation> DbgLoc)
   : IGM(IGM), Builder(IGM.getLLVMContext()),
-    CurFn(Fn),  DbgScope(DbgScope)
+    CurFn(Fn), DbgScope(DbgScope)
   {
 
   // Make sure the instructions in this function are attached its debug scope.

lib/Parse/Lexer.cpp

@@ -1627,14 +1627,14 @@ void Lexer::lexImpl() {
     return formToken(tok::l_square, TokStart);
   }
   case '(': return formToken(tok::l_paren, TokStart);
-  case '}': return formToken(tok::r_brace,  TokStart);
+  case '}': return formToken(tok::r_brace, TokStart);
   case ']': return formToken(tok::r_square, TokStart);
   case ')':
-    return formToken(tok::r_paren,  TokStart);
+    return formToken(tok::r_paren, TokStart);
 
-  case ',': return formToken(tok::comma,    TokStart);
-  case ';': return formToken(tok::semi,     TokStart);
-  case ':': return formToken(tok::colon,    TokStart);
+  case ',': return formToken(tok::comma, TokStart);
+  case ';': return formToken(tok::semi, TokStart);
+  case ':': return formToken(tok::colon, TokStart);
 
   case '#':
     return lexHash();