diff --git a/CHANGELOG.md b/CHANGELOG.md index c303495af990b..fc79f27731e14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2891,7 +2891,7 @@ Latest @_silgen_name("foo") @objc ``` - The `,` was vestigial when the attribute syntax consisted of bracked lists. + The `,` was vestigial when the attribute syntax consisted of bracket lists. * `switch` now always requires a statement after a `case` or `default`. @@ -3106,7 +3106,7 @@ Latest inference (e.g. when passing a function argument). * Properties defined in classes are now dynamically dispatched and can be - overriden with `@override`. Currently `@override` only works with computed properties + overridden with `@override`. Currently `@override` only works with computed properties overriding other computed properties, but this will be enhanced in coming weeks. @@ -3190,7 +3190,7 @@ Latest ``` * The compiler now warns about cases where a variable is inferred to have - `AnyObject`, `AnyClass`, or `()` type, since type inferrence can turn a simple + `AnyObject`, `AnyClass`, or `()` type, since type inference can turn a simple mistake (e.g. failing to cast an `AnyObject` when you meant to) into something with ripple effects. Here is a simple example: @@ -3386,7 +3386,7 @@ Latest `#if` block. Target configurations are tested against their values via a pseudo-function - invocation expression, taking a single argument expressed as an identitifer. + invocation expression, taking a single argument expressed as an identifier. The argument represents certain static build-time information. There are currently two supported target configurations: @@ -4708,7 +4708,7 @@ Latest ``` * Attribute syntax has been redesigned (see **(rdar://10700853)** and - **(rdar://14462729)**) so that attributes now preceed the declaration and use + **(rdar://14462729)**) so that attributes now precede the declaration and use the `@` character to signify them. Where before you might have written: ```swift @@ -4830,7 +4830,7 @@ Latest ``` checks whether `object` has a value and, if so, asks for the length of - its title. `titleLength` wil have type `Int?`, and if `object` was + its title. `titleLength` will have type `Int?`, and if `object` was missing, the variable will be initialized to None. * Objects with type `id` can now be used as the receiver of property @@ -5293,5 +5293,5 @@ Latest * `POSIX.EnvironmentVariables` and `swift.CommandLineArguments` global variables were merged into a `swift.Process` variable. Now you can access command line - arguments with `Process.arguments`. In order to acces environment variables + arguments with `Process.arguments`. In order to access environment variables add `import POSIX` and use `Process.environmentVariables`. diff --git a/docs/doxygen.css b/docs/doxygen.css index 83951f673db8d..d5691ed7e62d1 100644 --- a/docs/doxygen.css +++ b/docs/doxygen.css @@ -313,8 +313,8 @@ HR { height: 1px; /* * LLVM Modifications. - * Note: Everything above here is generated with "doxygen -w htlm" command. See - * "doxygen --help" for details. What follows are CSS overrides for LLVM + * Note: Everything above here is generated with "doxygen -w html" command. See + * "doxygen --help" for details. What follows are CSS overrides for LLVM * specific formatting. We want to keep the above so it can be replaced with * subsequent doxygen upgrades. */ diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h index f5fff6a3514e6..505af2a7926a9 100644 --- a/include/swift/SIL/SILInstruction.h +++ b/include/swift/SIL/SILInstruction.h @@ -864,7 +864,7 @@ class ApplyInst : public ApplyInstBase { return V->getKind() == ValueKind::ApplyInst; } - /// Returns true if the called function has an error result but is not actully + /// Returns true if the called function has an error result but is not actually /// throwing an error. bool isNonThrowing() const { return isNonThrowingApply(); diff --git a/lib/AST/ArchetypeBuilder.cpp b/lib/AST/ArchetypeBuilder.cpp index fe7aafddc3f21..f3305d27e3c48 100644 --- a/lib/AST/ArchetypeBuilder.cpp +++ b/lib/AST/ArchetypeBuilder.cpp @@ -854,7 +854,7 @@ bool ArchetypeBuilder::addSameTypeRequirementBetweenArchetypes( T1 = T1->getRepresentative(); T2 = T2->getRepresentative(); - // If the representives are already the same, we're done. + // If the representatives are already the same, we're done. if (T1 == T2) return false; diff --git a/lib/AST/ConformanceLookupTable.cpp b/lib/AST/ConformanceLookupTable.cpp index e109506048cf4..a063ac5977c9a 100644 --- a/lib/AST/ConformanceLookupTable.cpp +++ b/lib/AST/ConformanceLookupTable.cpp @@ -543,7 +543,7 @@ ConformanceLookupTable::Ordering ConformanceLookupTable::compareConformances( bool &diagnoseSuperseded) { // If one entry is fixed and the other is not, we have our answer. if (lhs->isFixed() != rhs->isFixed()) { - // If the non-fixed conformance is not replacable, we have a failure to + // If the non-fixed conformance is not replaceable, we have a failure to // diagnose. diagnoseSuperseded = (lhs->isFixed() && !isReplaceable(rhs->getRankingKind())) || diff --git a/lib/AST/Verifier.cpp b/lib/AST/Verifier.cpp index 937ecc1ac440d..3c8d0681f25e6 100644 --- a/lib/AST/Verifier.cpp +++ b/lib/AST/Verifier.cpp @@ -436,7 +436,7 @@ struct ASTNodeBase {}; return false; // We should know about archetypes corresponding to opened - // existerntial archetypes. + // existential archetypes. if (archetype->getOpenedExistentialType()) { if (OpenedExistentialArchetypes.count(archetype) == 0) { Out << "Found opened existential archetype " diff --git a/utils/swift-bench.py b/utils/swift-bench.py index 893ddbca28354..f083f12816b2a 100644 --- a/utils/swift-bench.py +++ b/utils/swift-bench.py @@ -26,7 +26,7 @@ # o When all files are compiled, the harness begins to run the tests. The # harness chooses a number of iterations for each tests to achieve the best # accuracy in the given time limit (in order to do that, it performs several -# auxiliary test runs). When the iteration number is chosen, the measurent +# auxiliary test runs). When the iteration number is chosen, the measurement # of execution time is actually performed. # o At this point everything is ready, and the harness simply reports the # results.