Skip to content

Commit e9cae7b

Browse files
committed
[Foundation] Update CharacterSet and NSCharacterSet punctuationCharacters to more consistent naming
Addresses rdar://problem/26628434 Swift3: "whitespaces"?
1 parent 183cb54 commit e9cae7b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

apinotes/Foundation.apinotes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Classes:
4444
SwiftName: symbols
4545
- Name: newlineCharacterSet
4646
SwiftName: newlines
47+
- Name: punctuationCharacterSet
48+
SwiftName: punctuationCharacters
4749
Methods:
4850
- Selector: 'hasMemberInPlane:'
4951
SwiftName: hasMemberInPlane(_:)

stdlib/public/SDK/Foundation/CharacterSet.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,14 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
202202
return CharacterSet(reference: NSCharacterSet.illegalCharacters as NSCharacterSet)
203203
}
204204

205-
/// Returns a character set containing the characters in Unicode General Category P*.
205+
@available(*, unavailable, renamed: "punctuationCharacters")
206206
public static var punctuation : CharacterSet {
207-
return CharacterSet(reference: NSCharacterSet.punctuation as NSCharacterSet)
207+
return CharacterSet(reference: NSCharacterSet.punctuationCharacters as NSCharacterSet)
208+
}
209+
210+
/// Returns a character set containing the characters in Unicode General Category P*.
211+
public static var punctuationCharacters : CharacterSet {
212+
return CharacterSet(reference: NSCharacterSet.punctuationCharacters as NSCharacterSet)
208213
}
209214

210215
/// Returns a character set containing the characters in Unicode General Category Lt.

0 commit comments

Comments
 (0)