Skip to content

JSONEncoder: Rename data coding enum values to align with SE-0167 #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 18, 2017
Merged

JSONEncoder: Rename data coding enum values to align with SE-0167 #1219

merged 1 commit into from
Sep 18, 2017

Conversation

spevans
Copy link
Contributor

@spevans spevans commented Sep 16, 2017

  • DataEncodingStrategy.base64Encode -> .base64
  • DataDecodingStrategy.base64Decode -> .base64

@spevans
JSONEncoder: Rename data coding enum values to align with SE-0167
20bdeec 
- DataEncodingStrategy.base64Encode -> .base64
- DataDecodingStrategy.base64Decode -> .base64
@spevans
Copy link
Contributor Author

spevans commented Sep 16, 2017

@swift-ci please test

1 similar comment
@spevans
Copy link
Contributor Author

spevans commented Sep 16, 2017

@swift-ci please test

@spevans spevans requested a review from itaiferber September 16, 2017 21:57
@ianpartridge
Copy link
Contributor

Looks good, but there are other cases in DataEncodingStrategy and DataDecodingStrategy which aren't correct.

@spevans
Copy link
Contributor Author

spevans commented Sep 17, 2017

@ianpartridge Which other cases aren't correct? TBH, I was only doing enough to get the tests to compile against macOS Foundation

@ianpartridge
Copy link
Contributor

We're missing case deferredToData in both. In general, JSONEncoder.swift needs bringing back in sync with the overlay as @itaiferber has made commits over there without updating this repo.

@ianpartridge
Copy link
Contributor

I'm going to merge this as-is and look to fix the remaining API issues in JSONEncoder.swift in a followup PR.

@ianpartridge ianpartridge merged commit 7e617e2 into swiftlang:master Sep 18, 2017
@spevans spevans deleted the pr_jsonencoder_enums branch September 19, 2017 15:02
ianpartridge pushed a commit to ianpartridge/swift-corelibs-foundation that referenced this pull request Oct 9, 2017
@spevans @ianpartridge
JSONEncoder: Rename data coding enum values to align with SE-0167 (sw…
1e175cb 
…iftlang#1219)

- DataEncodingStrategy.base64Encode -> .base64
- DataDecodingStrategy.base64Decode -> .base64
@itaiferber itaiferber mentioned this pull request Sep 18, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@itaiferber itaiferber Awaiting requested review from itaiferber

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@spevans @ianpartridge