Merge remote-tracking branch 'origin/master' into swift-3-indexing-model

This commit is contained in:
Dmitri Gribenko
2016-03-11 00:20:34 -08:00
113 changed files with 2633 additions and 1263 deletions

View File

@@ -1326,7 +1326,7 @@ extension String {
/// characters.
@warn_unused_result
public func addingPercentEncoding(
withAllowedCharaters allowedCharacters: NSCharacterSet
withAllowedCharacters allowedCharacters: NSCharacterSet
) -> String? {
// FIXME: the documentation states that this method can return nil if the
// transformation is not possible, without going into further details. The