Skip to content

Conversation

@amartini51
Copy link
Member

Cherry-picks the fixes that resolved the following:

rdar://82053644
rdar://60543202
rdar://68225196
rdar://79412011
rdar://76254761
rdar://78889410

Fixes rdar://78889410

(cherry picked from commit f1d87de)
Fixes rdar://76254761.

(cherry picked from commit 36832a8)
Fixes rdar://79412011

(cherry picked from commit 8ca0e30)
Follow-on to commit 36832a8.

(cherry picked from commit 4c82b77)
Fixes rdar://68225196

(cherry picked from commit 00e18a2)
Fixes rdar://60543202

(cherry picked from commit d0d4a88)
Fixes <rdar://82053644>.

(cherry picked from commit e48de1a)
Let the later changes in stdlib/public/Concurrency/Task.swift win, since
they contain and supersede this minor fix anyhow, instead of creating a
merge conflict with 'main'.

This reverts commit 1d63a5d.
@amartini51
Copy link
Member Author

@swift-ci Please smoke test

Copy link
Contributor

@invalidname invalidname left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@amartini51 amartini51 merged commit e6cbf54 into swiftlang:main Dec 13, 2021
@amartini51 amartini51 deleted the doc_fixes_main branch December 13, 2021 18:31
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