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-api-guidelines

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-02-17 14:40:05 -08:00
parent 0e1c488f9a b480ab1f5f
commit dd75aed67a
450 changed files with 8406 additions and 5202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/1_stdlib/NSStringAPI.swift
View File

@@ -40,7 +40,7 @@ class NonContiguousNSString : NSString {
super.init()
}
@objc(copyWithZone:) override func copy(withZone zone: NSZone) -> AnyObject {
@objc(copyWithZone:) override func copy(with zone: NSZone) -> AnyObject {
// Ensure that copying this string produces a class that CoreFoundation
// does not know about.
return self
@@ -1654,11 +1654,11 @@ NSStringAPIs.test("byTrimmingCharactersIn(_:)") {
NSCharacterSet(charactersIn: "\u{3058}")))
}
NSStringAPIs.test("stringsByAppendingPaths(_:)") {
expectEqual([], "".stringsByAppendingPaths([]))
NSStringAPIs.test("NSString.stringsByAppendingPaths(_:)") {
expectEqual([], "".strings(byAppendingPaths: []))
expectEqual(
[ "/tmp/foo", "/tmp/bar" ],
"/tmp".stringsByAppendingPaths([ "foo", "bar" ]))
"/tmp".strings(byAppendingPaths: [ "foo", "bar" ]))
}
NSStringAPIs.test("substringFrom(_:)") {