Merge pull request #3165 from practicalswift/typo-fixes-20160623

Author: swift-ci

include/swift/AST/Types.h

@@ -2495,7 +2495,7 @@ BEGIN_CAN_TYPE_WRAPPER(GenericFunctionType, AnyFunctionType)
                                     CanType input, CanType result,
                                     const ExtInfo &info) {
     // Knowing that the argument types are independently canonical is
-    // not suffiicient to guarantee that the function type will be canonical.
+    // not sufficient to guarantee that the function type will be canonical.
     auto fnType = GenericFunctionType::get(sig, input, result, info);
     return cast<GenericFunctionType>(fnType->getCanonicalType());
   }

stdlib/public/SDK/Foundation/Data.swift

@@ -163,7 +163,7 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
 
     /// Initialize a `Data` with the specified size.
     ///
-    /// This initializer doesn not necessarily allocate the requested memory right away. Mutable data allocates additional memory as needed, so `capacity` simply establishes the initial capacity. When it does allocate the initial memory, though, it allocates the specified amount.
+    /// This initializer doesn't necessarily allocate the requested memory right away. Mutable data allocates additional memory as needed, so `capacity` simply establishes the initial capacity. When it does allocate the initial memory, though, it allocates the specified amount.
     ///
     /// This method sets the `count` of the data to 0.
     /// 

stdlib/public/core/FixedPoint.swift.gyb

@@ -460,7 +460,7 @@ fixed_fixed_conversion_function = gyb.parse_template("fixed_fixed_conversion_fun
   result = (Builtin.${srcExt}_Int${srcBits}_Int${bits}(src), false._value)
 %       end
 % 
-% if not safelyConvertable:
+% if not safelyConvertible:
   ${error_check}
 % end
   self._value = result.value
@@ -472,7 +472,7 @@ fixed_fixed_conversion_function = gyb.parse_template("fixed_fixed_conversion_fun
 %    srcSigned = src_ty.is_signed
 %    Src = src_ty.stdlib_name
 %    (srcSign, srcExt) = ('s', 'sext') if srcSigned else ('u', 'zext')
-%    safelyConvertable = (srcBits < bits and (srcSign == sign or signed)) or (srcBits == bits and srcSign == sign)
+%    safelyConvertible = (srcBits < bits and (srcSign == sign or signed)) or (srcBits == bits and srcSign == sign)
 
 @_transparent
 extension ${Self} {
@@ -487,7 +487,7 @@ extension ${Self} {
     }
   }
 
-% if safelyConvertable: 
+% if safelyConvertible:
   @available(*, message: "Converting ${Src} to ${Self} will always succeed.")
 % end
   @_transparent 

test/1_stdlib/Runtime.swift.gyb

@@ -1543,9 +1543,9 @@ AvailabilityVersionsTestSuite.test("lexicographic_compare") {
   checkComparable(.lt, version(0, 0, 0), version(0, 1, 0))
   checkComparable(.lt, version(0, 0, 0), version(1, 0, 0))
 
-  checkComparable(.lt,version(10, 9, 0), version(10, 10, 0))
-  checkComparable(.lt,version(10, 9, 11), version(10, 10, 0))
-  checkComparable(.lt,version(10, 10, 3), version(10, 11, 0))
+  checkComparable(.lt, version(10, 9, 0), version(10, 10, 0))
+  checkComparable(.lt, version(10, 9, 11), version(10, 10, 0))
+  checkComparable(.lt, version(10, 10, 3), version(10, 11, 0))
 
   checkComparable(.lt, version(8, 3, 0), version(9, 0, 0))
 

tools/SourceKit/lib/Core/Context.cpp

@@ -17,9 +17,8 @@
 using namespace SourceKit;
 
 SourceKit::Context::Context(StringRef RuntimeLibPath,
-    		llvm::function_ref<
-    			std::unique_ptr<LangSupport>(Context &)> LangSupportFactoryFn)
-  : RuntimeLibPath(RuntimeLibPath),
+    llvm::function_ref<std::unique_ptr<LangSupport>(Context &)>
+    LangSupportFactoryFn) : RuntimeLibPath(RuntimeLibPath),
     NotificationCtr(new NotificationCenter()) {
   // Should be called last after everything is initialized.
   SwiftLang = LangSupportFactoryFn(*this);