Skip to content

Commit f31040b

Browse files
committed
Merge pull request #374 from jutaz/bugfix/more-typos
Fix a few more typos
2 parents 8ea38cb + 043c518 commit f31040b

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Latest
7575

7676
* Field getters and setters are now created for named unions imported from C.
7777
In addition, an initializer with a named parameter for the field is provided.
78-
For example, given the following Objective-C `typdef`:
78+
For example, given the following Objective-C `typedef`:
7979

8080
```objc
8181
typedef union IntOrFloat {

lib/AST/Type.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2125,7 +2125,7 @@ Type ProtocolCompositionType::get(const ASTContext &C,
21252125
return Protocols.front()->getDeclaredType();
21262126

21272127
// Form the set of canonical protocol types from the protocol
2128-
// declarations, and use that to buid the canonical composition type.
2128+
// declarations, and use that to build the canonical composition type.
21292129
SmallVector<Type, 4> CanProtocolTypes;
21302130
std::transform(Protocols.begin(), Protocols.end(),
21312131
std::back_inserter(CanProtocolTypes),

lib/Sema/CSDiag.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,7 +2060,7 @@ bool FailureDiagnosis::diagnoseConstraintFailure() {
20602060
if (isConversionConstraint(C))
20612061
return rankedConstraints.push_back({C, CR_ConversionConstraint});
20622062

2063-
// We occassionally end up with disjunction constraints containing an
2063+
// We occasionally end up with disjunction constraints containing an
20642064
// original constraint along with one considered with a fix. If we find
20652065
// this situation, add the original one to our list for diagnosis.
20662066
if (C->getKind() == ConstraintKind::Disjunction) {
@@ -2111,7 +2111,7 @@ bool FailureDiagnosis::diagnoseConstraintFailure() {
21112111
classifyConstraint(&C);
21122112

21132113
// Okay, now that we've classified all the constraints, sort them by their
2114-
// priority and priviledge the favored constraints.
2114+
// priority and privilege the favored constraints.
21152115
std::stable_sort(rankedConstraints.begin(), rankedConstraints.end(),
21162116
[&] (RCElt LHS, RCElt RHS) {
21172117
// Rank things by their kind as the highest priority.

lib/Sema/CSGen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,7 @@ namespace {
26212621
if (arg != call->getArg())
26222622
return;
26232623

2624-
// Dig out the function, looking through, parenthses, ?, and !.
2624+
// Dig out the function, looking through, parentheses, ?, and !.
26252625
auto fn = call->getFn();
26262626
do {
26272627
fn = fn->getSemanticsProvidingExpr();

lib/Sema/CSSimplify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ matchCallArguments(ArrayRef<CallArgParam> args,
444444
if (param.Variadic)
445445
continue;
446446

447-
// Parameters with defaults can be unfilfilled.
447+
// Parameters with defaults can be unfulfilled.
448448
if (param.HasDefaultArgument)
449449
continue;
450450

lib/Sema/CSSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static Optional<Type> checkTypeOfBinding(ConstraintSystem &cs,
7070
return type;
7171
}
7272

73-
/// Reconsistitute type sugar, e.g., for array types, dictionary
73+
/// Reconstitute type sugar, e.g., for array types, dictionary
7474
/// types, optionals, etc.
7575
static Type reconstituteSugar(Type type) {
7676
if (auto boundGeneric = dyn_cast<BoundGenericType>(type.getPointer())) {

lib/Sema/CodeSynthesis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ static void synthesizeAddressedMaterializeForSet(FuncDecl *materializeForSet,
13481348
}();
13491349

13501350
// Initialize the callback storage with the owner value, which is
1351-
// the second elemenet of the addressor result.
1351+
// the second element of the addressor result.
13521352
Expr *owner = new (ctx) DeclRefExpr(tempDecl, SourceLoc(), IsImplicit);
13531353
owner = new (ctx) TupleElementExpr(owner, SourceLoc(), /*field index*/ 1,
13541354
SourceLoc(), Type());

lib/Sema/ConstraintSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ struct MemberLookupResult {
10521052
Unsolved,
10531053

10541054
/// This result indicates that the member reference is erroneous, but was
1055-
/// already dianosed. Don't emit another error.
1055+
/// already diagnosed. Don't emit another error.
10561056
ErrorAlreadyDiagnosed,
10571057

10581058
/// This result indicates that the lookup produced candidate lists,

0 commit comments

Comments
 (0)