Merge remote-tracking branch 'origin' into swift-3-api-guidelines

This commit is contained in:
Max Moiseev
2015-12-21 12:02:13 -08:00
241 changed files with 2298 additions and 2200 deletions

View File

@@ -1396,8 +1396,8 @@ NSStringAPIs.test("folding(options:locale:)") {
func fwo(
s: String, _ options: NSStringCompareOptions
)(loc: NSLocale?) -> String {
return s.folding(options: options, locale: loc)
) -> (NSLocale?) -> String {
return { loc in s.stringByFoldingWithOptions(options, locale: loc) }
}
expectLocalizedEquality("abcd", fwo("abCD", .CaseInsensitiveSearch), "en")