Skip to content
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

Fix compiling on 6.1 #3057

Merged
merged 6 commits into from
Jan 14, 2025
Merged

Fix compiling on 6.1 #3057

merged 6 commits into from
Jan 14, 2025

Conversation

Lukasa
Copy link
Contributor

@Lukasa Lukasa commented Jan 14, 2025

Motivation:

Swift 6.1 nightlies have added many new warnings and errors to NIO. This patch resolves all of them.

Modifications:

  • Clean up missing imports
  • Move away from @_implementationOnly where necessary
  • Fix a few things where Sendable mismatches were present.

Result:

Clean compile again

@Lukasa Lukasa added the 🆕 semver/minor Adds new public API. label Jan 14, 2025
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import DequeModule
@preconcurrency import DequeModule
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we actually need a @preconcurrency import? Deque is Sendable if its Element is Sendable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, because we support versions of swift-collections so old that they don't have that conformance. Let's lift the constraint.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now fixed.

Sources/NIOHTTP1/HTTPDecoder.swift Show resolved Hide resolved
Motivation:

Swift 6.1 nightlies have added many new warnings and errors to NIO.
This patch resolves all but one of them.

Modifications:

- Clean up missing imports
- Move away from @_implementationOnly where necessary
- Fix a few things where Sendable mismatches were present.

Result:

Clean compile again
@Lukasa Lukasa force-pushed the cb-fix-61-compile branch from 6257e96 to 7e5ff76 Compare January 14, 2025 14:53
@Lukasa
Copy link
Contributor Author

Lukasa commented Jan 14, 2025

I'll be merging over the API breakage checker, which is wrong.

@Lukasa Lukasa merged commit 96877af into apple:main Jan 14, 2025
33 of 35 checks passed
@Lukasa Lukasa deleted the cb-fix-61-compile branch January 14, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🆕 semver/minor Adds new public API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants