Skip to content

Simplify imports in SocketAddresses.swift #3696

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

Open
glbrntt wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −9
Open

Simplify imports in SocketAddresses.swift #3696

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9b4f41
Simplify imports in SocketAddresses.swift
glbrntt Aug 11, 2026
d3bf324
Merge branch 'main' into sock-addr-imports
glbrntt Aug 11, 2026
3e24506
Merge branch 'main' into sock-addr-imports
glbrntt Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Sources/NIOCore/SocketAddresses.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,14 @@ private typealias in_port_t = WinSDK.u_short
private typealias sa_family_t = WinSDK.ADDRESS_FAMILY
#elseif canImport(Darwin)
import Darwin
#elseif os(Linux) || os(Android)
#elseif os(Linux) || os(Android) || os(FreeBSD) || os(OpenBSD)
#if canImport(Glibc)
@preconcurrency import Glibc
#elseif canImport(Musl)
@preconcurrency import Musl
#elseif canImport(Android)
@preconcurrency import Android
#endif
import CNIOLinux
#elseif os(FreeBSD)
@preconcurrency import Glibc
import CNIOFreeBSD
#elseif os(OpenBSD)
@preconcurrency import Glibc
import CNIOOpenBSD

@fabianfett fabianfett Aug 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is the CNIOOpenBSD not needed anymore? Well CI should show.

@glbrntt glbrntt Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

There are no CNIOOpenBSD_* symbols in this file which makes me think it isn't.(All symbols in the header have that prefix, see here.)

It's the same for CNIOLinux: it appears as if the import isn't necessary here.

#endif // canImport(Glibc)
#elseif canImport(WASILibc)
@preconcurrency import WASILibc
#else
Expand Down
Loading