[4.0] Optionality updates to Codable API #10706
Merged
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
added 6 commits
June 29, 2017 13:21
* Add encodeNil(forKey:)/encodeNil() for keyed/unkeyed encoding containers * Add decodeNil(forKey:)/decodeNil() for keyed/unkeyed decoding containers * Give default implementation of decodeIfPresent(forKey:)/ decodeIfPresent(_:) on keyed/unkeyed decoding containers instead of decode(forKey:)/decode(_:) * Expose all encode/decode methods on keyed encoding & decoding containers to allow overriding default methods (which were previously not forwarding)
* Add encodeNil/decodeNil variants on keyed and unkeyed containers * Give implementations of decode() variants instead of decodeIfPresent()
* Add encodeNil/decodeNil variants on keyed and unkeyed containers * Give implementations of decode() variants instead of decodeIfPresent()
To make it slightly easier to tell at a glance if a method is implemented as part of API (public/open), shared implementation detail (fileprivate), or implementation detail meaningful only to a given type (private).
* Update {JSON,PropertyList}Decoder to allow superDecoder()s to wrap
null value so current implementations of collections can decode
contained objects from nil
* Eliminate null checks from unboxing in the general case (so types can at least attempt to decode from nil) * Add unit tests to confirm this behavior
|
@swift-ci Please test |
|
@shahmishal When I merged in #10667, I also merged in swiftlang/swift-corelibs-foundation#1087 simultaneously. Since these have to go in together, I think this will end up breaking folks' Linux 4.0 CI builds until this is in. Just a heads-up; we're looking to merge this in ASAP to fix that. |
|
Build failed |
parkera
approved these changes
Jun 29, 2017
|
@swift-ci Please clean test Linux |
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.
What's in this pull request?
Cherry-picks #10667 to
swift-4.0-branch.Explanation: As laid out in a proposed update to SE-0166 and SE-0167, there are optionality updates that we wanted to introduce to the Codable API. This implements the remainder of those updates which had not yet been implemented:
encodeNil(forKey:)anddecodeNil(forKey:)have been added to keyed containersencodeNil()anddecodeNil()have been added to unkeyed containersdecode(...)in terms ofdecodeIfPresent(...)on all containers has been reversed: withdecodeNil(...)in place, a default implementation ofdecodeIfPresent(...)is now given on all containers, anddecode(...)must be implemented insteadKeyedEncodingContainerandKeyedDecodingContainerso it should be possible to give actual implementations instead of calling into the defaultsScope: Affects
Encoder/Decoderwriters as well as users of the Codable API withOptionalvalues.Radars:
Risk: Low
Testing: This adds unit tests to confirm that decoding from null values works as expected.