Merge branch 'main' into async-channel-executethenclose

Package.swift

@@ -568,3 +568,14 @@ if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         .package(path: "../swift-system"),
     ]
 }
+
+// ---    STANDARD CROSS-REPO SETTINGS DO NOT EDIT   --- //
+for target in package.targets {
+    if target.type != .plugin {
+        var settings = target.swiftSettings ?? []
+        // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
+        settings.append(.enableUpcomingFeature("MemberImportVisibility"))
+        target.swiftSettings = settings
+    }
+}
+// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //

Sources/NIOCrashTester/CrashTests+Strict.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !canImport(Darwin) || os(macOS)
+import NIOCore
 import NIOPosix
 
 struct StrictCrashTests {

Sources/NIOCrashTester/CrashTests+System.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !canImport(Darwin) || os(macOS)
+import NIOCore
 import NIOPosix
 import Foundation
 

Sources/NIOMulticastChat/main.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CNIOLinux
 import NIOCore
 import NIOPosix
 

Sources/NIOPosix/BaseSocket.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOConcurrencyHelpers
 import NIOCore
 

Sources/NIOPosix/Bootstrap.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CNIOLinux
 import NIOCore
 
 #if os(Windows)

Sources/NIOPosix/DatagramVectorReadManager.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CNIOLinux
 import NIOCore
 
 /// An object that manages issuing vector reads for datagram channels.

Sources/NIOPosix/NonBlockingFileIO.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOConcurrencyHelpers
 import NIOCore
 

Sources/NIOPosix/PendingDatagramWritesManager.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Atomics
+import CNIOLinux
 import NIOCore
 
 private struct PendingDatagramWrite {

Sources/NIOPosix/PendingWritesManager.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Atomics
+import CNIOLinux
 import NIOCore
 
 private struct PendingStreamWrite {

Sources/NIOPosix/SelectorEpoll.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import NIOConcurrencyHelpers
 import NIOCore
 
 #if !SWIFTNIO_USE_IO_URING

Sources/NIOPosix/Socket.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOCore
 
 /// The container used for writing multiple buffers via `writev`.

Sources/NIOPosix/SocketChannel.swift

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CNIOLinux
 import NIOCore
 
 #if os(Windows)

Tests/NIOFileSystemTests/FileInfoTests.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import XCTest
 import _NIOFileSystem
 
@@ -23,6 +24,14 @@ import Glibc
 import Android
 #endif
 
+#if canImport(Darwin)
+private let S_IFREG = Darwin.S_IFREG
+#elseif canImport(Glibc)
+private let S_IFREG = Glibc.S_IFREG
+#elseif canImport(Musl)
+private let S_IFREG = Musl.S_IFREG
+#endif
+
 final class FileInfoTests: XCTestCase {
     private var status: CInterop.Stat {
         var status = CInterop.Stat()

Tests/NIOFileSystemTests/Internal/SyscallTests.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import SystemPackage
 import XCTest
 @_spi(Testing) import _NIOFileSystem

Tests/NIOPosixTests/BlockingIOThreadPoolTest.swift

@@ -14,6 +14,7 @@
 
 import Dispatch
 import Foundation
+import NIOCore
 import NIOPosix
 import XCTest
 

Tests/NIOPosixTests/ControlMessageTests.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import XCTest
 
 @testable import NIOPosix

Tests/NIOPosixTests/NIOThreadPoolTest.swift

@@ -15,6 +15,7 @@
 import Atomics
 import Dispatch
 import NIOConcurrencyHelpers
+import NIOCore
 import NIOEmbedded
 import XCTest
 

Tests/NIOPosixTests/NonBlockingFileIOTest.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Atomics
+import CNIOLinux
 import NIOCore
 import XCTest
 

Tests/NIOPosixTests/PendingDatagramWritesManagerTests.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOEmbedded
 import XCTest
 

Tests/NIOPosixTests/SocketAddressTest.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import XCTest
 
 @testable import NIOCore

Tests/NIOPosixTests/SocketOptionProviderTest.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOCore
 import NIOPosix
 import XCTest

Tests/NIOPosixTests/StreamChannelsTest.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Atomics
+import CNIOLinux
 import NIOCore
 import NIOTestUtils
 import XCTest

Tests/NIOPosixTests/SyscallAbstractionLayer.swift

@@ -15,6 +15,7 @@
 // This file contains a syscall abstraction layer (SAL) which hooks the Selector and the Socket in a way that we can
 // play the kernel whilst NIO thinks it's running on a real OS.
 
+import CNIOLinux
 import NIOConcurrencyHelpers
 import NIOCore
 import XCTest

Tests/NIOPosixTests/SystemTest.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CNIOLinux
 import NIOCore
 import XCTest
 

Tests/NIOPosixTests/ThreadTest.swift

@@ -14,6 +14,7 @@
 
 import Dispatch
 import NIOConcurrencyHelpers
+import NIOCore
 import XCTest
 
 @testable import NIOPosix