Skip to content

Implement support for @objc(name) on enum cases #797

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 2 commits into from
Jan 6, 2016
Merged

Implement support for @objc(name) on enum cases #797

merged 2 commits into from
Jan 6, 2016

Conversation

lilyball
Copy link
Contributor

No description provided.

@jrose-apple jrose-apple self-assigned this Jan 4, 2016
@lilyball lilyball force-pushed the enum-constant-objc branch from d6c7ca4 to 2376fa4 Compare January 6, 2016 20:12
@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

PR updated

@jrose-apple I ended up going with your original suggested error text. It is a bit wordy, but it does get across the desired message.

@jrose-apple
Copy link
Contributor

That is my only comment so I'll merge anyway and just fix it afterwards. :-)

@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

I can push an amended commit easily enough.

@jrose-apple
Copy link
Contributor

Oh, well if you're around then okay!

@lilyball lilyball force-pushed the enum-constant-objc branch from 2376fa4 to f473851 Compare January 6, 2016 22:47
@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

PR updated.

@jrose-apple
Copy link
Contributor

Oh, I guess this should get release-noted too.

@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

Oh right. I'll add a commit for that.

@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

Hrm, looks like we forgot to add a release note for supporting @objc(EnumName) on enums. Tell you what, go ahead and merge this and I'll submit a separate PR to add both notes. I'd have to rebase this PR anyway to avoid a merge conflict on CHANGELOG if I were to add it right now.

@jrose-apple
Copy link
Contributor

Seems reasonable. Thanks! waits for local tests to finish

@lilyball lilyball mentioned this pull request Jan 6, 2016
Merged
@lilyball
Copy link
Contributor Author

lilyball commented Jan 6, 2016

Submitted the CHANGELOG change as #900.

jrose-apple added a commit that referenced this pull request Jan 6, 2016
@jrose-apple
Merge pull request #797 from kballard/enum-constant-objc
6ef18cd 
Implement support for @objc(name) on enum cases. Changelog update coming next.
@jrose-apple jrose-apple merged commit 6ef18cd into swiftlang:master Jan 6, 2016
@lilyball lilyball deleted the enum-constant-objc branch January 6, 2016 22:57
@lattner
Copy link
Contributor

lattner commented Jan 6, 2016

Awesome, thanks Kevin!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jrose-apple jrose-apple

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lilyball @jrose-apple @lattner