diff --git a/CHANGELOG.md b/CHANGELOG.md index e54bb8ee55321..fddee49017657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,8 @@ Swift 3.1 * [SE-0080][]: - Adds a new family of conversion initializers to all numeric types that - either complete successfully without loss of information or return nil. + Adds a new family of conversion initializers to all numeric types that + either complete successfully without loss of information or return nil. * Swift will now warn when an `NSObject` subclass attempts to override the class `initialize` method. Swift doesn't guarantee that references to class @@ -49,7 +49,7 @@ Swift 3.1 the compiler will prevent them from being used in the first place. * Indirect fields from C structures and unions are now always imported, while - they previously weren't imported if they belonged to an union. This is done by + they previously weren't imported if they belonged to a union. This is done by naming anonymous fields. For example: ```c @@ -83,7 +83,7 @@ Swift 3.1 * The `withoutActuallyEscaping` function from [SE-0103][] has been implemented. To pass off a non-escaping closure to an API that formally takes an - `@escaping` closure, but which is used in a way that will not in fact + `@escaping` closure, but which is used in a way that will not in fact escape it in practice, use `withoutActuallyEscaping` to get an escapable copy of the closure and delimit its expected lifetime. For example: diff --git a/include/swift/AST/ExprNodes.def b/include/swift/AST/ExprNodes.def index f48e69d77ca9c..caa4eee40d573 100644 --- a/include/swift/AST/ExprNodes.def +++ b/include/swift/AST/ExprNodes.def @@ -40,7 +40,7 @@ #define UNCHECKED_EXPR(Id, Parent) EXPR(Id, Parent) #endif -/// An literal expression node represents a literal value, such as a number, +/// A literal expression node represents a literal value, such as a number, /// boolean, string, etc. /// /// By default, these are treated like any other expression. diff --git a/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp b/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp index 94ca577298e4b..83c5468a2b631 100644 --- a/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp +++ b/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp @@ -1157,7 +1157,7 @@ bool EscapeAnalysis::buildConnectionGraphForDestructor( // The object is local, but we cannot determine its type. return false; } - // If Ty is a an optional, its deallocation is equivalent to the deallocation + // If Ty is an optional, its deallocation is equivalent to the deallocation // of its payload. // TODO: Generalize it. Destructor of an aggregate type is equivalent to calling // destructors for its components. diff --git a/stdlib/public/runtime/StaticBinaryELF.cpp b/stdlib/public/runtime/StaticBinaryELF.cpp index 32d499e394073..fa4e5b6260485 100644 --- a/stdlib/public/runtime/StaticBinaryELF.cpp +++ b/stdlib/public/runtime/StaticBinaryELF.cpp @@ -121,7 +121,7 @@ class StaticBinaryELF { if (programHeaders == nullptr) { return; } - // If a interpreter is set in the program headers then this is a + // If an interpreter is set in the program headers then this is a // dynamic executable and therefore not valid. for (size_t idx = 0; idx < elfHeader.e_phnum; idx++) { if (programHeaders[idx].p_type == PT_INTERP) {