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

Merge remote-tracking branch 'origin/master' into swift-3-indexing-model

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-03-21 14:41:15 -07:00
parent c8f5047f66 65719e8ce0
commit a6cd57222a
404 changed files with 11030 additions and 6789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,7 +389,7 @@ extension String {
if let matches = nsMatches {
// Since this function is effectively a bridge thunk, use the
// bridge thunk semantics for the NSArray conversion
matchesIntoArray._setIfNonNil { _convertNSArrayToArray(matches) }
matchesIntoArray._setIfNonNil { return matches as! [String] }
}
if let n = nsOutputName {
@@ -411,7 +411,7 @@ extension String {
let nsa = _ns.componentsSeparatedByCharacters(in: separator) as NSArray
// Since this function is effectively a bridge thunk, use the
// bridge thunk semantics for the NSArray conversion
return _convertNSArrayToArray(nsa)
return nsa as! [String]
}
@@ -423,7 +423,7 @@ extension String {
let nsa = _ns.componentsSeparated(by: separator) as NSArray
// Since this function is effectively a bridge thunk, use the
// bridge thunk semantics for the NSArray conversion
return _convertNSArrayToArray(nsa)
return nsa as! [String]
}
// - (const char *)cStringUsingEncoding:(NSStringEncoding)encoding
@@ -1045,7 +1045,7 @@ extension String {
}
}
return _convertNSArrayToArray(result)
return result as! [String]
}
// - (NSComparisonResult)localizedCaseInsensitiveCompare:(NSString *)aString
@@ -1361,7 +1361,7 @@ extension String {
/// string constructed from a given format string and the following
/// arguments.
@warn_unused_result
public func stringByAppendingFormat(
public func appendingFormat(
format: String, _ arguments: CVarArg...
) -> String {
return _ns.appending(
@@ -1906,8 +1906,8 @@ extension String {
fatalError("unavailable function can't be called")
}
@available(*, unavailable, renamed: "stringByAppendingFormat")
public func appendingFormat(
@available(*, unavailable, renamed: "appendingFormat")
public func stringByAppendingFormat(
format: String, _ arguments: CVarArg...
) -> String {
fatalError("unavailable function can't be called")