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

Enable imports of failable initializers by default.

Browse Source 
Swift SVN r21699
This commit is contained in:
Doug Gregor
2014-09-04 06:32:12 +00:00
parent 19b470b454
commit 692ff2f52a
24 changed files with 95 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/objc/Foundation/NSStringAPI.swift
View File

@@ -199,7 +199,7 @@ extension String {
encoding enc: NSStringEncoding,
error: NSErrorPointer = nil
) -> String? {
return NSString.stringWithContentsOfFile(path, encoding: enc, error: error)
return NSString(contentsOfFile: path, encoding: enc, error: error)
}
// + (instancetype)
@@ -215,7 +215,7 @@ extension String {
usedEncoding: UnsafeMutablePointer<NSStringEncoding> = nil,
error: NSErrorPointer = nil
) -> String? {
return NSString.stringWithContentsOfFile(path, usedEncoding: usedEncoding,
return NSString(contentsOfFile: path, usedEncoding: usedEncoding,
error: error)
}
@@ -230,7 +230,7 @@ extension String {
public static func stringWithContentsOfURL(
url: NSURL, encoding enc: NSStringEncoding, error: NSErrorPointer = nil
) -> String? {
return NSString.stringWithContentsOfURL(url, encoding: enc, error: error)
return NSString(contentsOfURL: url, encoding: enc, error: error)
}
// + (instancetype)
@@ -246,7 +246,7 @@ extension String {
usedEncoding enc: UnsafeMutablePointer<NSStringEncoding> = nil,
error: NSErrorPointer = nil
) -> String? {
return NSString.stringWithContentsOfURL(url, usedEncoding: enc,
return NSString(contentsOfURL: url, usedEncoding: enc,
error: error)
}