Skip to content

Commit a3b8806

Browse files
Merge pull request #1611 from practicalswift/typo-fixes-20160310
[gardening] Fix recently introduced typos
2 parents 2eb227d + 5b028d0 commit a3b8806

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

lib/Parse/ParseDecl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,9 +1738,9 @@ bool Parser::isStartOfDecl() {
17381738
if (!isKeywordPossibleDeclStart(Tok)) return false;
17391739

17401740
// When 'init' appears inside another 'init', it's likely the user wants to
1741-
// invoke a initializer but forgets to prefix it with 'self.' or 'super.'
1741+
// invoke an initializer but forgets to prefix it with 'self.' or 'super.'
17421742
// Otherwise, expect 'init' to be the start of a declaration (and complain
1743-
// when the expectation is not fullfilled).
1743+
// when the expectation is not fulfilled).
17441744
if (Tok.is(tok::kw_init)) {
17451745
return !isa<ConstructorDecl>(CurDeclContext);
17461746
}

stdlib/public/SDK/Foundation/NSStringAPI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ extension String {
13141314
/// characters.
13151315
@warn_unused_result
13161316
public func addingPercentEncoding(
1317-
withAllowedCharaters allowedCharacters: NSCharacterSet
1317+
withAllowedCharacters allowedCharacters: NSCharacterSet
13181318
) -> String? {
13191319
// FIXME: the documentation states that this method can return nil if the
13201320
// transformation is not possible, without going into further details. The

stdlib/public/core/Arrays.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public struct ${Self}<Element>
325325
return Builtin.castToNativeObject(_buffer.owner)
326326
}
327327

328-
// FIXME(ABI): move to an initalizer on _Buffer.
328+
// FIXME(ABI): move to an initializer on _Buffer.
329329
static internal func _copyBuffer(buffer: inout _Buffer) {
330330
let newBuffer = _ContiguousArrayBuffer<Element>(
331331
uninitializedCount: buffer.count, minimumCapacity: buffer.count)

stdlib/public/core/CString.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extension String {
5757
public static func decodeCString<Encoding : UnicodeCodec>(
5858
cString: UnsafePointer<Encoding.CodeUnit>,
5959
as encoding: Encoding.Type,
60-
repairingInvalidCodeUnits isReparing: Bool = true)
60+
repairingInvalidCodeUnits isRepairing: Bool = true)
6161
-> (result: String, repairsMade: Bool)? {
6262

6363
if cString._isNull {
@@ -68,7 +68,7 @@ extension String {
6868
start: cString, count: len)
6969

7070
let (stringBuffer, hadError) = _StringBuffer.fromCodeUnits(
71-
buffer, encoding: encoding, repairIllFormedSequences: isReparing)
71+
buffer, encoding: encoding, repairIllFormedSequences: isRepairing)
7272
return stringBuffer.map {
7373
(result: String(_storage: $0), repairsMade: hadError)
7474
}

stdlib/public/core/Collection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ extension Collection {
749749
fatalError("unavailable function can't be called")
750750
}
751751

752-
@available(*, unavailable, message="Removed in Swift 3. Please use underestimatedCount peoperty.")
752+
@available(*, unavailable, message="Removed in Swift 3. Please use underestimatedCount property.")
753753
public func underestimateCount() -> Int {
754754
fatalError("unavailable function can't be called")
755755
}

test/IRGen/enum_switch_singleton_enum_in_optional.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enum Optional<T> { case some(T), none }
66
class AClass {
77
}
88

9-
protocol AProto {
9+
protocol AProto {
1010
}
1111

1212
enum AnEnum {

test/Prototypes/CollectionTransformers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public protocol ApproximateCountableSequence : Sequence {
2424
var approximateCount: ApproximateCount { get }
2525
}
2626

27-
/// A collection that provides an efficient way to spilt its index ranges.
27+
/// A collection that provides an efficient way to split its index ranges.
2828
public protocol SplittableCollection : Collection {
2929
// We need this protocol so that collections with only forward or bidirectional
3030
// traversals could customize their splitting behavior.

0 commit comments

Comments
 (0)