Merge pull request #6441 from practicalswift/☕

practicalswift · web-flow · commit cc6fe4f3b248 · 2016-12-21T22:59:46.000+01:00
[gardening] Fix accidental double and triple spaces.
diff --git a/lib/IRGen/IRGenDebugInfo.h b/lib/IRGen/IRGenDebugInfo.h
@@ -137,7 +137,7 @@ class IRGenDebugInfo {
   /// Set the location for SWIFT_ENTRY_POINT_FUNCTION.
   void setEntryPointLoc(IRBuilder &Builder);
 
-  /// Return the scope for  SWIFT_ENTRY_POINT_FUNCTION.
+  /// Return the scope for SWIFT_ENTRY_POINT_FUNCTION.
   llvm::DIScope *getEntryPointFn();
   
   /// Emit debug info for an import declaration.
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -1061,7 +1061,7 @@ bool swift::diagnoseArgumentLabelError(TypeChecker &TC, const Expr *expr,
       return false;
     }
 
-    // This is a scalar-to-tuple conversion. Add the  name.  We "know"
+    // This is a scalar-to-tuple conversion. Add the name. We "know"
     // that we're inside a ParenExpr, because ParenExprs are required
     // by the syntax and locator resolution looks through on level of
     // them.
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
@@ -577,7 +577,7 @@ class TypeChecker final : public LazyResolver {
     return FunctionAsEscapingArg[decl];
   }
 
-  /// Record an occurrence of  a function that captures inout values as a return
+  /// Record an occurrence of a function that captures inout values as a return
   /// value
   ///
   /// \param decl the function that occurs as a return value.
diff --git a/stdlib/public/core/HashedCollections.swift.gyb b/stdlib/public/core/HashedCollections.swift.gyb
@@ -124,7 +124,7 @@ import SwiftShims
 // declared its actual type parameters. Similarly, the empty singleton would 
 // have to declare its actual type parameters. If the singleton was, for 
 // instance, a `HashableStorage<(), ()>`, then it would be a violation of 
-// Swift's strict  aliasing rules to pass it where a `HashableStorage<Int, Int>`
+// Swift's strict aliasing rules to pass it where a `HashableStorage<Int, Int>`
 // was expected.
 //
 // It's therefore necessary for several types to store a RawStorage, rather than
diff --git a/test/SILGen/errors.swift b/test/SILGen/errors.swift
@@ -370,7 +370,7 @@ func getHungryCat(_ food: CatFood) throws -> Cat {
     return try dont_make_a_cat()
   }
 }
-// errors.getHungryCat  throws (errors.CatFood) -> errors.Cat
+// errors.getHungryCat throws (errors.CatFood) -> errors.Cat
 // CHECK-LABEL: sil hidden @_TF6errors12getHungryCatFzOS_7CatFoodCS_3Cat : $@convention(thin) (CatFood) -> (@owned Cat, @error Error)
 // CHECK: bb0(%0 : $CatFood):
 // CHECK:   debug_value undef : $Error, var, name "$error", argno 2
diff --git a/test/SILOptimizer/bridged_casts_folding.swift b/test/SILOptimizer/bridged_casts_folding.swift
@@ -420,7 +420,7 @@ public func testCondCastSwiftDoubleToNSNumber() -> NSNumber? {
 }
 
 
-// Check optimization of casts from  Swift Array to NSArray
+// Check optimization of casts from Swift Array to NSArray
 
 var arrInt: [Int] = [1, 2, 3, 4]
 var arrDouble: [Double] = [1.1, 2.2, 3.3, 4.4]
@@ -488,7 +488,7 @@ public func testCondCastSwiftToNSArrayString() -> NSArray? {
 }
 
 
-// Check optimization of casts from  Swift Dict to NSDict
+// Check optimization of casts from Swift Dict to NSDict
 
 var dictInt: [Int: Int] = [1:1, 2:2, 3:3, 4:4]
 var dictDouble: [Double: Double] = [1.1 : 1.1, 2.2 : 2.2, 3.3 : 3.3, 4.4 : 4.4]
@@ -556,7 +556,7 @@ public func testCondCastSwiftToNSDictString() -> NSDictionary? {
 }
 
 
-// Check optimization of casts from  Swift Set to NSSet
+// Check optimization of casts from Swift Set to NSSet
 
 var setInt: Set<Int> = [1, 2, 3, 4]
 var setDouble: Set<Double> = [1.1, 2.2, 3.3, 4.4]
diff --git a/test/SILOptimizer/dead_store_elim.sil b/test/SILOptimizer/dead_store_elim.sil
@@ -1119,7 +1119,7 @@ bb0(%0 : $*S7):
 
 /// We are not performing partial dead store for store %3 to %0#1 : $*S7,
 /// i.e. too many stores generated, but make sure we track the store correctly
-/// so that we can get rid of  store %56 to %57 : $*Int.
+/// so that we can get rid of store %56 to %57 : $*Int.
 ///
 /// CHECK-LABEL : partial_dead_store_bail_out_proper_propagation
 /// CHECK: bb0
diff --git a/test/SILOptimizer/devirt_inherited_conformance.swift b/test/SILOptimizer/devirt_inherited_conformance.swift
@@ -173,7 +173,7 @@ public func testCompareEquals() -> Bool {
 
 
 
-// Check that  acall of inherited Simple.== can be devirtualized.
+// Check that a call of inherited Simple.== can be devirtualized.
 // CHECK-LABEL: sil @_TF28devirt_inherited_conformance20testCompareMinMinMinFT_Sb : $@convention(thin) () -> Bool {
 // CHECK: bb0
 // CHECK-NEXT: integer_literal $Builtin.Int1, -1
diff --git a/test/SILOptimizer/devirt_jump_thread.sil b/test/SILOptimizer/devirt_jump_thread.sil
@@ -43,7 +43,7 @@ bb0(%0 : $Int32, %1 : $FooClass):
 // devirt_jump_thread.FooClass.foo (devirt_jump_thread.FooClass)(Swift.Int32) -> Swift.Int32
 sil [noinline] @_TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 {
 bb0(%0 : $Int32, %1 : $FooClass):
-  // function_ref @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+  // function_ref @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
   %2 = function_ref @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %3
   %3 = apply %2(%0, %1) : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %6
   return %3 : $Int32                                // id: %6
@@ -108,7 +108,7 @@ bb4(%26 : $Int32):                                  // Preds: bb11 bb12
   return %32 : $Int32                               // id: %33
 
 bb5(%34 : $FooClass):                             // Preds: bb0
-  // function_ref @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+  // function_ref @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
   %35 = function_ref @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %37
   strong_retain %0 : $FooClass                    // id: %36
   %37 = apply %35(%2, %34) : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %40
@@ -123,7 +123,7 @@ bb6:                                              // Preds: bb0
   br bb1(%43 : $Int32)                              // id: %44
 
 bb7(%45 : $FooClass):                             // Preds: bb1
-  // function_ref @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+  // function_ref @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
   %46 = function_ref @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %48
   strong_retain %0 : $FooClass                    // id: %47
   %48 = apply %46(%2, %45) : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %51
@@ -138,7 +138,7 @@ bb8:                                              // Preds: bb1
   br bb2(%54 : $Int32)                              // id: %55
 
 bb9(%56 : $FooClass):                             // Preds: bb2
-  // function_ref @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+  // function_ref @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
   %57 = function_ref @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %59
   strong_retain %0 : $FooClass                    // id: %58
   %59 = apply %57(%15, %56) : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %62
@@ -153,7 +153,7 @@ bb10:                                             // Preds: bb2
   br bb3(%65 : $Int32)                              // id: %66
 
 bb11(%67 : $FooClass):                            // Preds: bb3
-  // function_ref @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+  // function_ref @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
   %68 = function_ref @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %69
   %69 = apply %68(%24, %67) : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 // user: %72
   fix_lifetime %67 : $FooClass                    // id: %70
@@ -328,7 +328,7 @@ bb6:                                              // Preds: bb1
   br bb2(%28 : $Int32)                              // id: %29
 }
 
-// @!objc  with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
+// @!objc with unmangled suffix "no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi"
 sil [noinline] @_TTOS_no2g__TFC18devirt_jump_thread8FooClass3foofS0_FSiSi : $@convention(method) (Int32, @guaranteed FooClass) -> Int32 {
 bb0(%0 : $Int32, %1 : $FooClass):
   %2 = integer_literal $Builtin.Int32, 11          // user: %5
diff --git a/test/SILOptimizer/sil_combine.sil b/test/SILOptimizer/sil_combine.sil
@@ -440,8 +440,8 @@ enum U {
 // CHECK-NEXT: tuple ({{%[0-9]+}} : $U, {{%[0-9]+}} : $U, [[INVALID_CASE]] : $U)
 // CHECK-NEXT: return
 //
-// release_value  of an  enum without  any payload  or with  a trivial
-// typed payload  is a  no-op. Leave  enums with  non-trivial payloads
+// release_value of an enum without any payload or with a trivial
+// typed payload is a no-op. Leave enums with non-trivial payloads
 // alone.
 //
 // rdar://15568314
diff --git a/test/SILOptimizer/specialize_deep_generics.swift b/test/SILOptimizer/specialize_deep_generics.swift
@@ -19,7 +19,7 @@ struct PlusOne<X : Nat> : Nat {
 
 // Compiler used to keep performing the generic specialization of
 // computeNat for increasingly deeply nested bound generic types
-// like  PlusOne<PlusOne<....<PlusOne<Zero>>>
+// like PlusOne<PlusOne<....<PlusOne<Zero>>>
 func computeNat<T: Nat>(_ v : Int32, _ t: T) -> Int32 {
   if v == 0 {
     return t.val

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ bool swift::diagnoseArgumentLabelError(TypeChecker &TC, const Expr *expr,`
`1061`	`1061`	`return false;`
`1062`	`1062`	`}`
`1063`	`1063`
`1064`		`- // This is a scalar-to-tuple conversion. Add the name. We "know"`
	`1064`	`+ // This is a scalar-to-tuple conversion. Add the name. We "know"`
`1065`	`1065`	`// that we're inside a ParenExpr, because ParenExprs are required`
`1066`	`1066`	`// by the syntax and locator resolution looks through on level of`
`1067`	`1067`	`// them.`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ class TypeChecker final : public LazyResolver {`
`577`	`577`	`return FunctionAsEscapingArg[decl];`
`578`	`578`	`}`
`579`	`579`
`580`		`- /// Record an occurrence of a function that captures inout values as a return`
	`580`	`+ /// Record an occurrence of a function that captures inout values as a return`
`581`	`581`	`/// value`
`582`	`582`	`///`
`583`	`583`	`/// \param decl the function that occurs as a return value.`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ func getHungryCat(_ food: CatFood) throws -> Cat {`
`370`	`370`	`return try dont_make_a_cat()`
`371`	`371`	`}`
`372`	`372`	`}`
`373`		`-// errors.getHungryCat throws (errors.CatFood) -> errors.Cat`
	`373`	`+// errors.getHungryCat throws (errors.CatFood) -> errors.Cat`
`374`	`374`	`// CHECK-LABEL: sil hidden @_TF6errors12getHungryCatFzOS_7CatFoodCS_3Cat : $@convention(thin) (CatFood) -> (@owned Cat, @error Error)`
`375`	`375`	`// CHECK: bb0(%0 : $CatFood):`
`376`	`376`	`// CHECK: debug_value undef : $Error, var, name "$error", argno 2`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public func testCondCastSwiftDoubleToNSNumber() -> NSNumber? {`
`420`	`420`	`}`
`421`	`421`
`422`	`422`
`423`		`-// Check optimization of casts from Swift Array to NSArray`
	`423`	`+// Check optimization of casts from Swift Array to NSArray`
`424`	`424`
`425`	`425`	`var arrInt: [Int] = [1, 2, 3, 4]`
`426`	`426`	`var arrDouble: [Double] = [1.1, 2.2, 3.3, 4.4]`
`@@ -488,7 +488,7 @@ public func testCondCastSwiftToNSArrayString() -> NSArray? {`
`488`	`488`	`}`
`489`	`489`
`490`	`490`
`491`		`-// Check optimization of casts from Swift Dict to NSDict`
	`491`	`+// Check optimization of casts from Swift Dict to NSDict`
`492`	`492`
`493`	`493`	`var dictInt: [Int: Int] = [1:1, 2:2, 3:3, 4:4]`
`494`	`494`	`var dictDouble: [Double: Double] = [1.1 : 1.1, 2.2 : 2.2, 3.3 : 3.3, 4.4 : 4.4]`
`@@ -556,7 +556,7 @@ public func testCondCastSwiftToNSDictString() -> NSDictionary? {`
`556`	`556`	`}`
`557`	`557`
`558`	`558`
`559`		`-// Check optimization of casts from Swift Set to NSSet`
	`559`	`+// Check optimization of casts from Swift Set to NSSet`
`560`	`560`
`561`	`561`	`var setInt: Set<Int> = [1, 2, 3, 4]`
`562`	`562`	`var setDouble: Set<Double> = [1.1, 2.2, 3.3, 4.4]`