Remove swift-corelibs-foundation duplicate implementations of Decimal and JSONEncoder/JSONDecoder #5017
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
parkera
commented
Jul 19, 2024
| @@ -237,72 +237,36 @@ class TestJSONEncoder : XCTestCase { | |||
|
|
|||
| func test_encodingOutputFormattingSortedKeys() throws { | |||
| let expectedJSON = try XCTUnwrap(""" | |||
| {"2":"2","7":"7","25":"25","ａｌｉｃｅ":"ａｌｉｃｅ","bob":"bob","Charlie":"Charlie","中国":"中国","日本":"日本","韓国":"韓国"} | |||
There was a problem hiding this comment.
The sorting order changed in recent JSONEncoder implementations to be UTF8 byte based instead of a localized sort.
parkera
commented
Jul 19, 2024
| @@ -1286,8 +1286,8 @@ extension TestJSONSerialization { | |||
| } | |||
|
|
|||
| func test_serialize_Decimal() { | |||
| XCTAssertEqual(try trySerialize([-Decimal.leastNonzeroMagnitude]), "[-0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001]") | |||
There was a problem hiding this comment.
For now we have reverted to Darwin's Decimal behavior for the size of the mantissa, since it differed between platforms. We will revisit that after the Swift 6.0 release.
parkera
force-pushed
the
parkera/replace_json_coders
branch
from
9839bda to
0454f9f
Compare
parkera
commented
Jul 19, 2024
| @@ -835,9 +800,9 @@ class TestJSONEncoder : XCTestCase { | |||
| try decode(type, value) | |||
| XCTFail("Decode of \(value) to \(type) should not succeed") | |||
| } catch DecodingError.dataCorrupted(let context) { | |||
| XCTAssertEqual(context.debugDescription, errorMessage) | |||
| // Pass | |||
There was a problem hiding this comment.
Not really valuable to check the exact message here. Just needs to throw.
There was a problem hiding this comment.
Much better, thanks.
|
swiftlang/swift-foundation#751 @swift-ci please test |
kperryua
approved these changes
Jul 19, 2024
| @@ -835,9 +800,9 @@ class TestJSONEncoder : XCTestCase { | |||
| try decode(type, value) | |||
| XCTFail("Decode of \(value) to \(type) should not succeed") | |||
| } catch DecodingError.dataCorrupted(let context) { | |||
| XCTAssertEqual(context.debugDescription, errorMessage) | |||
| // Pass | |||
… and JSONEncoder/JSONDecoder
parkera
force-pushed
the
parkera/replace_json_coders
branch
from
0454f9f to
acf9154
Compare
|
@swift-ci test |
|
swiftlang/swift-foundation#751 @swift-ci please test |
|
@swift-ci please test windows |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also adjusts the Decimal tests so that we only test
NSDecimalNumberhere and rely on swift-foundation forDecimal.Relies on swiftlang/swift-foundation#751