From 38170aa549c1eaf4b27656a7cde2cf99cf8012bc Mon Sep 17 00:00:00 2001 From: Bhaktavatsal Reddy Date: Tue, 24 May 2016 17:05:38 +0530 Subject: [PATCH] change NSString(contentsOf:encoding:) to align with Darwin version --- Foundation/NSString.swift | 6 +++--- Foundation/String.swift | 4 ++-- TestFoundation/TestNSString.swift | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift index 066834c690..3511b44e30 100644 --- a/Foundation/NSString.swift +++ b/Foundation/NSString.swift @@ -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(readResult.bytes), readResult.length, CFStringConvertNSStringEncodingToEncoding(enc), true) else { throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileReadInapplicableStringEncodingError.rawValue, userInfo: [ @@ -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?) throws { + public convenience init(contentsOf url: NSURL, usedEncoding enc: UnsafeMutablePointer?) throws { NSUnimplemented() } diff --git a/Foundation/String.swift b/Foundation/String.swift index 863e45e160..7a6869aa32 100644 --- a/Foundation/String.swift +++ b/Foundation/String.swift @@ -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 } @@ -844,7 +844,7 @@ extension String { contentsOfURL url: NSURL, usedEncoding enc: UnsafeMutablePointer? = nil ) throws { - let ns = try NSString(contentsOfURL: url, usedEncoding: enc) + let ns = try NSString(contentsOf: url, usedEncoding: enc) self = ns._swiftObject } diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift index feb521c57c..ebe1e8fd89 100644 --- a/TestFoundation/TestNSString.swift +++ b/TestFoundation/TestNSString.swift @@ -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:") } }