Merge pull request #1306 from practicalswift/remove-some-double-spaces

lattner · lattner · commit 92fc7dbde351 · 2016-02-14T08:45:55.000-08:00
[gardening] Fix accidental double spaces
diff --git a/test/Constraints/array_literal.swift b/test/Constraints/array_literal.swift
@@ -10,7 +10,7 @@ struct DoubleList : ArrayLiteralConvertible {
   init(arrayLiteral elements: Double...) {}
 }
 
-struct  IntDict : ArrayLiteralConvertible {
+struct IntDict : ArrayLiteralConvertible {
   typealias Element = (String, Int)
   init(arrayLiteral elements: Element...) {}
 }
diff --git a/test/DebugInfo/bbentry-location.swift b/test/DebugInfo/bbentry-location.swift
@@ -8,7 +8,7 @@ class ActionViewController
 {
   var imageView: UIImageView!
   func viewDidLoad(inputItems: [AnyObject]) {
-    for item: AnyObject in  inputItems {
+    for item: AnyObject in inputItems {
       let inputItem = item as! NSExtensionItem
       for provider: AnyObject in inputItem.attachments! {
         let itemProvider = provider as! NSItemProvider
diff --git a/test/Generics/associated_self_constraints.swift b/test/Generics/associated_self_constraints.swift
@@ -38,7 +38,7 @@ class Subject<T>: Observer, Observable {
     // Observable implementation
     
     func subscribe<O: Observer where O.Value == T>(observer: O) -> Any {
-        self.onNextFunc = { (item: T) -> Void  in
+        self.onNextFunc = { (item: T) -> Void in
             observer.onNext(item)
         }
         
diff --git a/test/IDE/annotation.swift b/test/IDE/annotation.swift
@@ -286,7 +286,7 @@ extension C12.Inn {}
 // CHECK: extension <TypeAlias@[[@LINE-4]]:11>AliasC12</TypeAlias>.<TypeAlias@[[@LINE-6]]:13>AliasInn</TypeAlias> {}
 extension AliasC12.AliasInn {}
 
-typealias  AliasPH = C12
+typealias AliasPH = C12
 func testPH(x: Int) {}
 func testPH(x: AliasPH) {}
 // CHECK: <Func@[[@LINE-1]]:6>testPH</Func>(<#T##x: AliasPH##AliasPH##C12#>)
diff --git a/test/IDE/complete_init.swift b/test/IDE/complete_init.swift
@@ -52,7 +52,7 @@ protocol I : G {
 
 typealias J = A
 
-struct  K {
+struct K {
   typealias X = A
   struct Y {}
 }
diff --git a/test/Inputs/clang-importer-sdk/usr/include/Foundation.h b/test/Inputs/clang-importer-sdk/usr/include/Foundation.h
@@ -1006,5 +1006,5 @@ extern NSString *NSHTTPRequestKey;
 -(void)messageSomeObject:(nonnull id)object selector:(SEL)selector;
 @end
 
-#define NSTimeIntervalSince1970  978307200.0
+#define NSTimeIntervalSince1970 978307200.0
 #define NS_DO_SOMETHING 17
diff --git a/test/Interpreter/generics.swift b/test/Interpreter/generics.swift
@@ -102,7 +102,7 @@ class Base {
 }
 
 class D1 : Base {
-    required  init() {}
+    required init() {}
     override func map() {
         v = 2
     }
diff --git a/test/Parse/EOF/block-comment-missing-newline.swift b/test/Parse/EOF/block-comment-missing-newline.swift
@@ -1,4 +1,4 @@
 // RUN: %target-parse-verify-swift
 
 // This file does not end in a trailing newline; this is deliberate!
-/* unterminated block comment  expected-note{{comment started here}} expected-error{{unterminated '/*' comment}}{{127-127=*/}}
+/* unterminated block comment expected-note{{comment started here}} expected-error{{unterminated '/*' comment}}{{127-127=*/}}
diff --git a/test/SILGen/Inputs/usr/include/BridgeTestFoundation.h b/test/SILGen/Inputs/usr/include/BridgeTestFoundation.h
@@ -87,5 +87,5 @@ void noescapeNonnullBlock(__attribute__((noescape)) void (^_Nonnull block)(void)
 void escapeNonnullBlock(void (^_Nonnull block)(void));
 
 void noescapeBlockAlias(__attribute__((noescape)) dispatch_block_t block);
-void noescapeNonnullBlockAlias(__attribute__((noescape)) _Nonnull dispatch_block_t  block);
-void escapeBlockAlias(dispatch_block_t  block);
+void noescapeNonnullBlockAlias(__attribute__((noescape)) _Nonnull dispatch_block_t block);
+void escapeBlockAlias(dispatch_block_t block);
diff --git a/test/SILGen/Inputs/usr/include/Gizmo.h b/test/SILGen/Inputs/usr/include/Gizmo.h
@@ -96,7 +96,7 @@ struct NSRect NSMakeRect(double, double, double, double);
 struct NSRect NSInsetRect(struct NSRect, double, double);
 NSString *NSStringFromRect(struct NSRect r);
 
-typedef  NS_ENUM(NSInteger, NSRuncingOptions) {
+typedef NS_ENUM(NSInteger, NSRuncingOptions) {
   NSRuncingMince = 123,
   NSRuncingQuinceSliced = 4567,
   NSRuncingQuinceJulienned = 5678,
diff --git a/test/SILOptimizer/cast_foldings.sil b/test/SILOptimizer/cast_foldings.sil
@@ -84,7 +84,7 @@ sil @function_cast_throw_to_throw : $@convention(thin) <T> () -> () {
 // CHECK-NEXT: store %{{.*}} to %0 : $*AClass
 sil @function_ref_cast_promote : $@convention(thin) (@out AClass, @in AnyObject) -> () {
 bb0(%0 : $*AClass, %1 : $*AnyObject):
-  unchecked_ref_cast_addr  AnyObject in %1 : $*AnyObject to AClass in %0 : $*AClass
+  unchecked_ref_cast_addr AnyObject in %1 : $*AnyObject to AClass in %0 : $*AClass
   %4 = tuple ()
   return %4 : $()
 }
@@ -98,7 +98,7 @@ bb0:
   %1 = alloc_stack $S
   store %0 to %1 : $*S
   %4 = alloc_stack $AnyObject
-  unchecked_ref_cast_addr  S in %1 : $*S to AnyObject in %4 : $*AnyObject
+  unchecked_ref_cast_addr S in %1 : $*S to AnyObject in %4 : $*AnyObject
   %6 = load %4 : $*AnyObject
   dealloc_stack %4 : $*AnyObject
   dealloc_stack %1 : $*S
diff --git a/test/SILOptimizer/definite_init_crashes.sil b/test/SILOptimizer/definite_init_crashes.sil
@@ -32,7 +32,7 @@ struct Single {
 }
 
 // CHECK-LABEL: sil @SingleTest
-sil @SingleTest : $@convention(method) (@inout  Single, Int) -> Single {
+sil @SingleTest : $@convention(method) (@inout Single, Int) -> Single {
 bb0(%0 : $*Single, %1 : $Int):
   %4 = alloc_box $Single
   %4a = project_box %4 : $@box Single
diff --git a/test/SILOptimizer/escape_analysis.sil b/test/SILOptimizer/escape_analysis.sil
@@ -939,7 +939,7 @@ bb0(%0 : $AnyObject):
 // CHECK-NEXT:  End
 sil @test_unchecked_ref_cast_addr : $@convention(thin) <T, U> (@out U, @in T, @thick U.Type) -> () {
 bb0(%0 : $*U, %1 : $*T, %2 : $@thick U.Type):
-  unchecked_ref_cast_addr  T in %1 : $*T to U in %0 : $*U
+  unchecked_ref_cast_addr T in %1 : $*T to U in %0 : $*U
   %5 = tuple ()
   return %5 : $()
 }
diff --git a/test/SILOptimizer/spec_recursion.swift b/test/SILOptimizer/spec_recursion.swift
@@ -13,7 +13,7 @@ x1.new_method(<, left: 0, right: 1)
 
 struct Test<T> {
   init() {}
-  func  recursive(x x : T)  {
+  func recursive(x x : T)  {
     return recursive(x: x)
   }
 }
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -522,9 +522,9 @@ while [[ "$1" ]] ; do
             if [[ "${dashless}" == *=* ]] ; then              # if there's an '=', the value
                 value="${dashless#*=}"                        #   is everything after the first '='
             elif [[ "$2" ]] && [[ "${2:0:1}" != "-" ]] ; then # else if the next parameter exists
-                value="$2"                                    #    but isn't  an option, use that
+                value="$2"                                    #   but isn't an option, use that
                 shift
-            else                                             # otherwise, the value is 1
+            else                                              # otherwise, the value is 1
                 value=1
             fi
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct DoubleList : ArrayLiteralConvertible {`
`10`	`10`	`init(arrayLiteral elements: Double...) {}`
`11`	`11`	`}`
`12`	`12`
`13`		`-struct IntDict : ArrayLiteralConvertible {`
	`13`	`+struct IntDict : ArrayLiteralConvertible {`
`14`	`14`	`typealias Element = (String, Int)`
`15`	`15`	`init(arrayLiteral elements: Element...) {}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class ActionViewController`
`8`	`8`	`{`
`9`	`9`	`var imageView: UIImageView!`
`10`	`10`	`func viewDidLoad(inputItems: [AnyObject]) {`
`11`		`- for item: AnyObject in inputItems {`
	`11`	`+ for item: AnyObject in inputItems {`
`12`	`12`	`let inputItem = item as! NSExtensionItem`
`13`	`13`	`for provider: AnyObject in inputItem.attachments! {`
`14`	`14`	`let itemProvider = provider as! NSItemProvider`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class Subject<T>: Observer, Observable {`
`38`	`38`	`// Observable implementation`
`39`	`39`
`40`	`40`	`func subscribe<O: Observer where O.Value == T>(observer: O) -> Any {`
`41`		`- self.onNextFunc = { (item: T) -> Void in`
	`41`	`+ self.onNextFunc = { (item: T) -> Void in`
`42`	`42`	`observer.onNext(item)`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protocol I : G {`
`52`	`52`
`53`	`53`	`typealias J = A`
`54`	`54`
`55`		`-struct K {`
	`55`	`+struct K {`
`56`	`56`	`typealias X = A`
`57`	`57`	`struct Y {}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class Base {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`class D1 : Base {`
`105`		`- required init() {}`
	`105`	`+ required init() {}`
`106`	`106`	`override func map() {`
`107`	`107`	`v = 2`
`108`	`108`	`}`