NSString(contentsOfFile:usedEncoding:) fixes. #1225
Conversation
dplanitzer
commented
Sep 18, 2017
dplanitzer
commented
- passing nil to the usedEncoding: parameter no longer causes the NSString(contentsOf:usedEncoding:) to terminate with an error.
- implemented NSString(contentsOfFile:usedEncoding:)
- String(contentsOfFile:) now works too
|
@swift-ci please test |
Foundation/NSString.swift
Outdated
| guard let enc = enc, let cf = CFStringCreateWithBytes(kCFAllocatorDefault, bytePtr + offset, readResult.length - offset, | ||
| CFStringConvertNSStringEncodingToEncoding(enc.pointee), true) else { | ||
| guard let cf = CFStringCreateWithBytes(kCFAllocatorDefault, bytePtr + offset, readResult.length - offset, | ||
| CFStringConvertNSStringEncodingToEncoding(encoding), true) else { |
There was a problem hiding this comment.
Drive-by nit: Please align this line with the parenthesis of the previous line, as was originally done.
Foundation/NSString.swift
Outdated
| } | ||
| } | ||
|
|
||
| enc?.pointee = encoding |
There was a problem hiding this comment.
Previously the code set enc?.pointee even if the CFStringCreateWithBytes() call failed and the function threw. Now it doesn't. Did you check what the behaviour of Darwin is in this regard?
- passing nil to the usedEncoding: parameter no longer causes the NSString(contentsOf:usedEncoding:) to terminate with an error. - implemented NSString(contentsOfFile:usedEncoding:) - String(contentsOfFile:) now works too
|
@xwu: formatting is fixed now @ianpartridge: I didn't cross check with the Darwin implementation. However, I've changed the code such that we now set the encoding out parameter before we call the CFStringCreate() function. |
|
this is on-par with the way the objc version does it @swift-ci please test and merge |
|
@swift-ci please test and merge |
|
Transient failure for the GitHub API requesting merge - the build succeeded. |
|
@swift-ci please test and merge |
Used to terminate on Linux but was fixed in swiftlang/swift-corelibs-foundation#1225
Used to terminate on Linux but was fixed in swiftlang/swift-corelibs-foundation#1225
