Skip to content

change NSString(contentsOf:encoding:) to align with Darwin version #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2016
Merged

change NSString(contentsOf:encoding:) to align with Darwin version #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Foundation/NSString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@ extension NSString {
}
}

public convenience init(contentsOfURL url: NSURL, encoding enc: UInt) throws {
public convenience init(contentsOf url: NSURL, encoding enc: UInt) throws {
let readResult = try NSData.init(contentsOfURL: url, options: [])
guard let cf = CFStringCreateWithBytes(kCFAllocatorDefault, UnsafePointer<UInt8>(readResult.bytes), readResult.length, CFStringConvertNSStringEncodingToEncoding(enc), true) else {
throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileReadInapplicableStringEncodingError.rawValue, userInfo: [
Expand All @@ -1275,10 +1275,10 @@ extension NSString {
}

public convenience init(contentsOfFile path: String, encoding enc: UInt) throws {
try self.init(contentsOfURL: NSURL(fileURLWithPath: path), encoding: enc)
try self.init(contentsOf: NSURL(fileURLWithPath: path), encoding: enc)
}

public convenience init(contentsOfURL url: NSURL, usedEncoding enc: UnsafeMutablePointer<UInt>?) throws {
public convenience init(contentsOf url: NSURL, usedEncoding enc: UnsafeMutablePointer<UInt>?) throws {
NSUnimplemented()
}

Expand Down
4 changes: 2 additions & 2 deletions Foundation/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ extension String {
contentsOfURL url: NSURL,
encoding enc: NSStringEncoding
) throws {
let ns = try NSString(contentsOfURL: url, encoding: enc)
let ns = try NSString(contentsOf: url, encoding: enc)
self = ns._swiftObject
}

Expand All @@ -844,7 +844,7 @@ extension String {
contentsOfURL url: NSURL,
usedEncoding enc: UnsafeMutablePointer<NSStringEncoding>? = nil
) throws {
let ns = try NSString(contentsOfURL: url, usedEncoding: enc)
let ns = try NSString(contentsOf: url, usedEncoding: enc)
self = ns._swiftObject
}

Expand Down
10 changes: 5 additions & 5 deletions TestFoundation/TestNSString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,16 +278,16 @@ class TestNSString : XCTestCase {
}

do {
let string = try NSString(contentsOfURL: testFileURL, encoding: NSUTF8StringEncoding)
let string = try NSString(contentsOf: testFileURL, encoding: NSUTF8StringEncoding)
XCTAssertEqual(string, "swift-corelibs-foundation")
} catch {
XCTFail("Unable to init NSString from contentsOfURL:encoding:")
XCTFail("Unable to init NSString from contentsOf:encoding:")
}
do {
let string = try NSString(contentsOfURL: testFileURL, encoding: NSUTF16StringEncoding)
XCTAssertNotEqual(string, "swift-corelibs-foundation", "Wrong result when reading UTF-8 file with UTF-16 encoding in contentsOfURL:encoding")
let string = try NSString(contentsOf: testFileURL, encoding: NSUTF16StringEncoding)
XCTAssertNotEqual(string, "swift-corelibs-foundation", "Wrong result when reading UTF-8 file with UTF-16 encoding in contentsOf:encoding")
} catch {
XCTFail("Unable to init NSString from contentsOfURL:encoding:")
XCTFail("Unable to init NSString from contentsOf:encoding:")
}
}

Expand Down