averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update master to build with Xcode 8 beta 2, OS X 10.12, iOS 10, tvOS 10, and watchOS 3 SDKs

Browse Source
This commit is contained in:
Mishal Shah
2016-07-05 09:53:03 -07:00
parent 2478993701
commit 23b646eed2
42 changed files with 464 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stdlib/public/SDK/Foundation/NSStringAPI.swift
View File

@@ -143,13 +143,13 @@ extension String {
//===--- Class Methods --------------------------------------------------===//
//===--------------------------------------------------------------------===//
// + (const NSStringEncoding *)availableStringEncodings
// @property (class) const NSStringEncoding *availableStringEncodings;
/// Returns an Array of the encodings string objects support
/// in the application's environment.
public static func availableStringEncodings() -> [Encoding] {
public static var availableStringEncodings: [Encoding] {
var result = [Encoding]()
var p = NSString.availableStringEncodings()
var p = NSString.availableStringEncodings
while p.pointee != 0 {
result.append(Encoding(rawValue: p.pointee))
p += 1
@@ -157,12 +157,12 @@ extension String {
return result
}
// + (NSStringEncoding)defaultCStringEncoding
// @property (class) NSStringEncoding defaultCStringEncoding;
/// Returns the C-string encoding assumed for any method accepting
/// a C string as an argument.
public static func defaultCStringEncoding() -> Encoding {
return Encoding(rawValue: NSString.defaultCStringEncoding())
public static var defaultCStringEncoding: Encoding {
return Encoding(rawValue: NSString.defaultCStringEncoding)
}
// + (NSString *)localizedNameOfStringEncoding:(NSStringEncoding)encoding
@@ -182,7 +182,7 @@ extension String {
public static func localizedStringWithFormat(
_ format: String, _ arguments: CVarArg...
) -> String {
return String(format: format, locale: Locale.current(),
return String(format: format, locale: Locale.current,
arguments: arguments)
}
@@ -1678,10 +1678,10 @@ extension String {
///
/// self.rangeOf(
/// other, options: .CaseInsensitiveSearch,
/// locale: Locale.current()) != nil
/// locale: Locale.current) != nil
public func localizedCaseInsensitiveContains(_ other: String) -> Bool {
let r = self.range(
of: other, options: .caseInsensitive, locale: Locale.current()
of: other, options: .caseInsensitive, locale: Locale.current
) != nil
if #available(OSX 10.10, iOS 8.0, *) {
_sanityCheck(r == _ns.localizedCaseInsensitiveContains(other))