Skip to content

Cherry-pick concurrency docs #40115

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.

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

Merged
merged 13 commits into from
Dec 7, 2021

Conversation

amartini51
Copy link
Member

@amartini51 amartini51 commented Nov 10, 2021

This PR incorporates the documentation changes to async sequences and tasks for Swift 5.5. Since I ran into conflicts and other issues using git cherry-pick to bring over the specific commits from 'release/5.5', I manually compared the two branches and copied the changes inside /// comments.

Confirmed that there are no unexpected changes outside of doc comments by running the following:

git diff github/main | grep '^+\|^-' | grep -v '^+++\|^---' \ |  grep -v '^- *///\|^+ *///'

In Task.swift a blank line was removed. This was from removing what looks like a doc comment that got left behind after the symbol it goes to was removed.

In TaskSleep.swift the comment "No public initializers" was changed from a /// comment to a regular // comment in to places. This change was also made on 'release/5.5'. It's a comment on a non-public symbol and isn't meant to be a documentation comment.

All of the documentation comments match what was on the Swift 5.5 release branch, except for a spelling mistake that had been corrected on 'main' but not on the release branch. I made these comparisons when 'main' was at 9c5e5ef and 'release/5.5' was at 18a849e.

@amartini51
Copy link
Member Author

@swift-ci Please smoke test.

@amartini51 amartini51 marked this pull request as ready for review November 11, 2021 07:05
@amartini51
Copy link
Member Author

@swift-ci Please smoke test Linux.

@amartini51 amartini51 requested a review from najacque December 2, 2021 19:28
@najacque
Copy link
Contributor

najacque commented Dec 7, 2021

Looks good

@najacque najacque merged commit 57ad1f1 into swiftlang:main Dec 7, 2021
@amartini51 amartini51 deleted the concurrency_docs_to_main branch December 7, 2021 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants