Skip to content

Commit 3b30fb4

Browse files
committed
Merge pull request #892 from practicalswift/typo-fixes-20160106b
[gardening] Fix recently introduced typos
2 parents 54dcd16 + 154f571 commit 3b30fb4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/IRGen/Fulfillment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class FulfillmentMap {
7171
virtual ~InterestingKeysCallback() = default;
7272
};
7373

74-
/// An implementaton of InterestingKeysCallback that returns everything
74+
/// An implementation of InterestingKeysCallback that returns everything
7575
/// fulfillable.
7676
struct Everything : InterestingKeysCallback {
7777
bool isInterestingType(CanType type) const override;

lib/IRGen/LocalTypeData.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ void LocalTypeDataCache::addAbstractForTypeMetadata(IRGenFunction &IGF,
199199
return;
200200
}
201201

202-
addAbstractForFullfillments(IGF, std::move(fulfillments),
202+
addAbstractForFulfillments(IGF, std::move(fulfillments),
203203
[&]() -> AbstractSource {
204204
return AbstractSource(AbstractSource::Kind::TypeMetadata, type, metadata);
205205
});
206206
}
207207

208208
void LocalTypeDataCache::
209-
addAbstractForFullfillments(IRGenFunction &IGF, FulfillmentMap &&fulfillments,
209+
addAbstractForFulfillments(IRGenFunction &IGF, FulfillmentMap &&fulfillments,
210210
llvm::function_ref<AbstractSource()> createSource) {
211211
// Add the source lazily.
212212
Optional<unsigned> sourceIndex;
@@ -241,7 +241,7 @@ addAbstractForFullfillments(IRGenFunction &IGF, FulfillmentMap &&fulfillments,
241241
auto key = getKey(type, localDataKind);
242242
auto &chain = Map[key];
243243

244-
// Check whether there's already an entr that's at least as good as the
244+
// Check whether there's already an entry that's at least as good as the
245245
// fulfillment.
246246
Optional<unsigned> fulfillmentCost;
247247
auto getFulfillmentCost = [&]() -> unsigned {

lib/IRGen/LocalTypeData.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ class LocalTypeDataCache {
222222

223223
std::vector<AbstractSource> AbstractSources;
224224

225-
void addAbstractForFullfillments(IRGenFunction &IGF,
226-
FulfillmentMap &&fulfillments,
225+
void addAbstractForFulfillments(IRGenFunction &IGF,
226+
FulfillmentMap &&fulfillments,
227227
llvm::function_ref<AbstractSource()> createSource);
228228

229229

lib/IRGen/LocalTypeDataKind.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class LocalTypeDataKind {
7777
/// A reference to a protocol witness table for an archetype.
7878
///
7979
/// This only works for non-concrete types because in principle we might
80-
/// have multiple concrete conformoances for a concrete type used in the
80+
/// have multiple concrete conformances for a concrete type used in the
8181
/// same function.
8282
static LocalTypeDataKind
8383
forArchetypeProtocolWitnessTable(ProtocolDecl *protocol) {
@@ -136,4 +136,4 @@ template <> struct llvm::DenseMapInfo<swift::irgen::LocalTypeDataKey> {
136136
}
137137
};
138138

139-
#endif
139+
#endif

0 commit comments

Comments
 (0)