Merge pull request #5514 from practicalswift/gardening-20161028

[gardening] Fix recently introduced typos.

Author: practicalswift

docs/SIL.rst

@@ -2178,7 +2178,7 @@ load_borrow
 
 Loads the value ``%1`` from the memory location ``%0``. The ``load_borrow``
 instruction creates a borrowed scope in which a read-only borrow value ``%1``
-can be used to read the value stored in ``%0``. The end of scope is deliminated
+can be used to read the value stored in ``%0``. The end of scope is delimited
 by an ``end_borrow`` instruction. All ``load_borrow`` instructions must be
 paired with exactly one ``end_borrow`` instruction along any path through the
 program. Until ``end_borrow``, it is illegal to invalidate or store to ``%0``.

lib/Sema/CSDiag.cpp

@@ -5331,7 +5331,7 @@ bool FailureDiagnosis::visitApplyExpr(ApplyExpr *callExpr) {
         return {CC_GeneralMismatch, {}};
 
       // FIXME: Handle matching of the generic types properly.
-      // Currently we don't filter result types containing generic parametes
+      // Currently we don't filter result types containing generic parameters
       // because there is no easy way to do that, and candidate set is going
       // to be pruned by matching of the argument types later on anyway, so
       // it's better to over report than to be too conservative.

test/Constraints/diagnostics.swift

@@ -851,7 +851,7 @@ let c_2505 = C_2505(arg: [C2_2505()]) // expected-error {{argument labels '(arg:
 // Diagnostic message for initialization with binary operations as right side
 let foo1255_3: String = 1 + 2 + 3 // expected-error {{cannot convert value of type 'Int' to specified type 'String'}}
 let foo1255_4: Dictionary<String, String> = ["hello": 1 + 2] // expected-error {{cannot convert value of type 'Int' to expected dictionary value type 'String'}}
-let foo1255_5: Dictionary<String, String> = [(1 + 2): "wolrd"] // expected-error {{cannot convert value of type 'Int' to expected dictionary key type 'String'}}
+let foo1255_5: Dictionary<String, String> = [(1 + 2): "world"] // expected-error {{cannot convert value of type 'Int' to expected dictionary key type 'String'}}
 let foo1255_6: [String] = [1 + 2 + 3] // expected-error {{cannot convert value of type 'Int' to expected element type 'String'}}
 
 // SR-2208

test/SILOptimizer/capture_promotion_generic_context.sil

@@ -7,7 +7,7 @@ import Builtin
 typealias Int = Builtin.Int32
 
 // rdar://problem/28945854: When a nongeneric closure was formed inside a
-// generic function, the capture promotion pass would erronenously try to
+// generic function, the capture promotion pass would erroneously try to
 // apply the generic caller's substitutions to the nongeneric callee, violating
 // invariants.
 

test/stdlib/TestFileManager.swift

@@ -75,12 +75,12 @@ class TestFileManager : TestFileManagerSuper {
 
     func testDirectoryEnumerator_error() {
         let fm = FileManager.default
-        let nonexistantURL = URL(fileURLWithPath: "\(NSTemporaryDirectory())/nonexistant")
+        let nonexistentURL = URL(fileURLWithPath: "\(NSTemporaryDirectory())/nonexistent")
 
         var invoked = false
-        let e = fm.enumerator(at: nonexistantURL, includingPropertiesForKeys: []) { (url, err) in
+        let e = fm.enumerator(at: nonexistentURL, includingPropertiesForKeys: []) { (url, err) in
             invoked = true
-            expectEqual(nonexistantURL, url)
+            expectEqual(nonexistentURL, url)
             expectEqual((err as NSError).code, NSFileReadNoSuchFileError)
             return true
         }
@@ -93,9 +93,9 @@ class TestFileManager : TestFileManagerSuper {
 
     func testDirectoryEnumerator_error_noHandler() {
         let fm = FileManager.default
-        let nonexistantURL = URL(fileURLWithPath: "\(NSTemporaryDirectory())/nonexistant")
+        let nonexistentURL = URL(fileURLWithPath: "\(NSTemporaryDirectory())/nonexistent")
 
-        let e = fm.enumerator(at: nonexistantURL, includingPropertiesForKeys: [])
+        let e = fm.enumerator(at: nonexistentURL, includingPropertiesForKeys: [])
         let url = e?.nextObject()
         expectTrue(url == nil)
 

tools/swift-api-digester/swift-api-digester.cpp

@@ -816,7 +816,8 @@ NodeUniquePtr SDKNode::constructSDKNode(llvm::yaml::MappingNode *Node) {
       break;
     case KeyKind::KK_ownership:
       Info.Ownership = swift::Ownership(getAsInt(Pair.getValue()));
-      assert(Info.Ownership != swift::Ownership::Strong && "Stong is implied.");
+      assert(Info.Ownership != swift::Ownership::Strong &&
+             "Strong is implied.");
       break;
 
     case KeyKind::KK_typeAttributes: {