Skip to content

Commit d5df3ab

Browse files
Merge pull request swiftlang#1538 from practicalswift/typo-fixes-20160304
[gardening] Fix recently introduced typos
2 parents c9768b3 + 5b28002 commit d5df3ab

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

benchmark/single-source/UTF8Decode.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import TestsUtils
1515
@inline(never)
1616
public func run_UTF8Decode(N: Int) {
1717
// 1-byte sequences
18-
// This test case is the longest as it's the most perfomance sensitive.
18+
// This test case is the longest as it's the most performance sensitive.
1919
let ascii = "Swift is a multi-paradigm, compiled programming language created for iOS, OS X, watchOS, tvOS and Linux development by Apple Inc. Swift is designed to work with Apple's Cocoa and Cocoa Touch frameworks and the large body of existing Objective-C code written for Apple products. Swift is intended to be more resilient to erroneous code (\"safer\") than Objective-C and also more concise. It is built with the LLVM compiler framework included in Xcode 6 and later and uses the Objective-C runtime, which allows C, Objective-C, C++ and Swift code to run within a single program."
2020
// 2-byte sequences
2121
let russian = "Ру́сский язы́к один из восточнославянских языков, национальный язык русского народа."

include/swift/AST/PrintOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct ArchetypeTransformContext {
5656

5757
struct SynthesizedExtensionInfo {
5858
ExtensionDecl *Ext = nullptr;
59-
std::vector<StringRef> KnownSatisifiedRequirments;
59+
std::vector<StringRef> KnownSatisfiedRequirements;
6060
operator bool() const { return Ext; }
6161
};
6262

include/swift/Runtime/Metadata.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ struct External {
120120
using RelativeDirectPointer = std::make_signed<StoredPointer>;
121121
};
122122

123-
/// Template template for branching on native pointer types versus
124-
/// external ones
123+
/// Template for branching on native pointer types versus external ones
125124
template <typename Runtime, template <typename> class Pointee>
126125
using TargetMetadataPointer
127126
= typename Runtime::template Pointer<Pointee<Runtime>>;

lib/AST/ASTPrinter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,13 @@ struct SynthesizedExtensionAnalyzer::Implementation {
240240
if(!canPossiblyConvertTo(First, Second, *DC))
241241
return Result;
242242
else if (isConvertibleTo(First, Second, *DC))
243-
Result.KnownSatisifiedRequirments.push_back(Req.getAsWrittenString());
243+
Result.KnownSatisfiedRequirements.push_back(Req.getAsWrittenString());
244244
break;
245245
case RequirementReprKind::SameType:
246246
if (!canPossiblyEqual(First, Second, *DC))
247247
return Result;
248248
else if (isEqual(First, Second, *DC))
249-
Result.KnownSatisifiedRequirments.push_back(Req.getAsWrittenString());
249+
Result.KnownSatisfiedRequirements.push_back(Req.getAsWrittenString());
250250
break;
251251
}
252252
}
@@ -314,7 +314,7 @@ bool SynthesizedExtensionAnalyzer::
314314
shouldPrintRequirement(ExtensionDecl *ED, StringRef Req) {
315315
auto Found = Impl.Results->find(ED);
316316
if (Found != Impl.Results->end()) {
317-
std::vector<StringRef> &KnownReqs = Found->getSecond().KnownSatisifiedRequirments;
317+
std::vector<StringRef> &KnownReqs = Found->getSecond().KnownSatisfiedRequirements;
318318
return KnownReqs.end() == std::find(KnownReqs.begin(), KnownReqs.end(), Req);
319319
}
320320
return true;

0 commit comments

Comments
 (0)