Skip to content

Commit 3e94baa

Browse files
committed
Merge pull request #380 from jutaz/bugfix/typos-take-3
Fix typos
2 parents f6e4355 + e799d3e commit 3e94baa

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2891,7 +2891,7 @@ Latest
28912891
@_silgen_name("foo") @objc
28922892
```
28932893

2894-
The `,` was vestigial when the attribute syntax consisted of bracked lists.
2894+
The `,` was vestigial when the attribute syntax consisted of bracket lists.
28952895

28962896
* `switch` now always requires a statement after a `case` or `default`.
28972897

@@ -3190,7 +3190,7 @@ Latest
31903190
```
31913191

31923192
* The compiler now warns about cases where a variable is inferred to have
3193-
`AnyObject`, `AnyClass`, or `()` type, since type inferrence can turn a simple
3193+
`AnyObject`, `AnyClass`, or `()` type, since type inference can turn a simple
31943194
mistake (e.g. failing to cast an `AnyObject` when you meant to) into something
31953195
with ripple effects. Here is a simple example:
31963196

@@ -3386,7 +3386,7 @@ Latest
33863386
`#if` block.
33873387

33883388
Target configurations are tested against their values via a pseudo-function
3389-
invocation expression, taking a single argument expressed as an identitifer.
3389+
invocation expression, taking a single argument expressed as an identifier.
33903390
The argument represents certain static build-time information.
33913391

33923392
There are currently two supported target configurations:
@@ -4830,7 +4830,7 @@ Latest
48304830
```
48314831

48324832
checks whether `object` has a value and, if so, asks for the length of
4833-
its title. `titleLength` wil have type `Int?`, and if `object` was
4833+
its title. `titleLength` will have type `Int?`, and if `object` was
48344834
missing, the variable will be initialized to None.
48354835

48364836
* Objects with type `id` can now be used as the receiver of property

docs/doxygen.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ HR { height: 1px;
313313

314314
/*
315315
* LLVM Modifications.
316-
* Note: Everything above here is generated with "doxygen -w htlm" command. See
317-
* "doxygen --help" for details. What follows are CSS overrides for LLVM
316+
* Note: Everything above here is generated with "doxygen -w html" command. See
317+
* "doxygen --help" for details. What follows are CSS overrides for LLVM
318318
* specific formatting. We want to keep the above so it can be replaced with
319319
* subsequent doxygen upgrades.
320320
*/

include/swift/SIL/SILInstruction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ class ApplyInst : public ApplyInstBase<ApplyInst, SILInstruction> {
871871
return V->getKind() == ValueKind::ApplyInst;
872872
}
873873

874-
/// Returns true if the called function has an error result but is not actully
874+
/// Returns true if the called function has an error result but is not actually
875875
/// throwing an error.
876876
bool isNonThrowing() const {
877877
return isNonThrowingApply();

lib/AST/ArchetypeBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ bool ArchetypeBuilder::addSameTypeRequirementBetweenArchetypes(
854854
T1 = T1->getRepresentative();
855855
T2 = T2->getRepresentative();
856856

857-
// If the representives are already the same, we're done.
857+
// If the representatives are already the same, we're done.
858858
if (T1 == T2)
859859
return false;
860860

lib/AST/ConformanceLookupTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ ConformanceLookupTable::Ordering ConformanceLookupTable::compareConformances(
543543
bool &diagnoseSuperseded) {
544544
// If one entry is fixed and the other is not, we have our answer.
545545
if (lhs->isFixed() != rhs->isFixed()) {
546-
// If the non-fixed conformance is not replacable, we have a failure to
546+
// If the non-fixed conformance is not replaceable, we have a failure to
547547
// diagnose.
548548
diagnoseSuperseded = (lhs->isFixed() &&
549549
!isReplaceable(rhs->getRankingKind())) ||

lib/AST/Verifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ struct ASTNodeBase {};
436436
return false;
437437

438438
// We should know about archetypes corresponding to opened
439-
// existerntial archetypes.
439+
// existential archetypes.
440440
if (archetype->getOpenedExistentialType()) {
441441
if (OpenedExistentialArchetypes.count(archetype) == 0) {
442442
Out << "Found opened existential archetype "

utils/swift-bench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# o When all files are compiled, the harness begins to run the tests. The
2727
# harness chooses a number of iterations for each tests to achieve the best
2828
# accuracy in the given time limit (in order to do that, it performs several
29-
# auxiliary test runs). When the iteration number is chosen, the measurent
29+
# auxiliary test runs). When the iteration number is chosen, the measurement
3030
# of execution time is actually performed.
3131
# o At this point everything is ready, and the harness simply reports the
3232
# results.

0 commit comments

Comments
 (0)