Skip to content

Revert Alexis' ns_error_domain changes from swift/main #2635

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 3 commits into from
Mar 10, 2021
Merged

Revert Alexis' ns_error_domain changes from swift/main #2635

merged 3 commits into from
Mar 10, 2021

Conversation

hyp
Copy link

@hyp hyp commented Mar 9, 2021

No description provided.

@hyp
Copy link
Author

hyp commented Mar 9, 2021

@swift-ci please test

@hyp
Copy link
Author

hyp commented Mar 9, 2021

@xymus I'm reverting your changes as they broke the CI (74168319) and they aren't actually present in the apple/stable branch, so the branches have diverged in the clang contents. I made a separate PR for apple/stable that fixes the nserrordomain attribute: #2634

@hyp hyp requested a review from xymus March 9, 2021 02:50
xymus
xymus approved these changes Mar 9, 2021
View reviewed changes
Copy link

@xymus xymus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@hyp
Copy link
Author

hyp commented Mar 9, 2021

@swift-ci please test

@hyp
Copy link
Author

hyp commented Mar 9, 2021

@swift-ci please test linux

@hyp hyp merged commit 198503d into swift/main Mar 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xymus xymus xymus approved these changes

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
@hyp @xymus