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

This commit is contained in:
Dmitri Gribenko
2016-04-16 00:30:12 -07:00
173 changed files with 5082 additions and 4411 deletions

View File

@@ -263,7 +263,7 @@ func expectLocalizedEquality(
_ expected: String,
_ op: (_: NSLocale?) -> String,
_ localeID: String? = nil,
@autoclosure _ message: () -> String = "",
_ message: @autoclosure () -> String = "",
showFrame: Bool = true,
stackTrace: SourceLocStack = SourceLocStack(),
file: String = #file, line: UInt = #line