averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "New value types for Calendar, TimeZone, and Locale"

Browse Source 
This reverts commit 46a9f57329.

This broke Swift CI, OSS incremental RA:

./swift/stdlib/public/SDK/Foundation/TimeZone.swift:228:45: error: 'NSTimeZone' is not implicitly convertible to 'TimeZone'; did you mean to use 'as' to explicitly convert?
        return lhs._wrapped.isEqual(to: rhs._wrapped)
This commit is contained in:
Andrew Trick
2016-07-16 18:34:32 -07:00
parent 46a9f57329
commit 888ff1ae99
20 changed files with 52 additions and 2497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/1_stdlib/NSStringAPI.swift
View File

@@ -262,18 +262,22 @@ func expectLocalizedEquality(
_ localeID: String? = nil,
_ message: @autoclosure () -> String = "",
showFrame: Bool = true,
stackTrace: SourceLocStack = SourceLocStack(),
stackTrace: SourceLocStack = SourceLocStack(),
file: String = #file, line: UInt = #line
) {
let trace = stackTrace.pushIf(showFrame, file: file, line: line)
let locale = localeID.map {
Locale(identifier: $0)
Locale(localeIdentifier: $0)
} ?? Locale.current
expectEqual(
expected, op(locale),
message(), stackTrace: trace)
message(), stackTrace: trace)
expectEqual(
op(Locale.system), op(nil),
message(), stackTrace: trace)
}
NSStringAPIs.test("capitalizedString(with:)") {
@@ -830,6 +834,8 @@ NSStringAPIs.test("init(format:locale:_:...)") {
var world: NSString = "world"
expectEqual("Hello, world!%42", String(format: "Hello, %@!%%%ld",
locale: nil, world, 42))
expectEqual("Hello, world!%42", String(format: "Hello, %@!%%%ld",
locale: Locale.system, world, 42))
}
NSStringAPIs.test("init(format:locale:arguments:)") {
@@ -837,6 +843,8 @@ NSStringAPIs.test("init(format:locale:arguments:)") {
let args: [CVarArg] = [ world, 42 ]
expectEqual("Hello, world!%42", String(format: "Hello, %@!%%%ld",
locale: nil, arguments: args))
expectEqual("Hello, world!%42", String(format: "Hello, %@!%%%ld",
locale: Locale.system, arguments: args))
}
NSStringAPIs.test("lastPathComponent") {