Merge branch 'master' into swift-3-api-guidelines

This commit is contained in:
Doug Gregor
2016-01-06 15:32:55 -08:00
178 changed files with 2785 additions and 1085 deletions

View File

@@ -232,7 +232,7 @@ extension String {
/// Produces a string created by copying the data from a given
/// C array of UTF8-encoded bytes.
public init?(utf8String bytes: UnsafePointer<CChar>) {
if let ns = NSString(utF8String: bytes) {
if let ns = NSString(utf8String: bytes) {
self = ns as String
} else {
return nil