Skip to content

Strict concurrency for NIOHPACK #502

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

Merged
Lukasa merged 1 commit into from
Mar 21, 2025
Merged

Strict concurrency for NIOHPACK #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,31 @@

import PackageDescription

let strictConcurrencyDevelopment = false

let strictConcurrencySettings: [SwiftSetting] = {
var initialSettings: [SwiftSetting] = []
initialSettings.append(contentsOf: [
.enableUpcomingFeature("StrictConcurrency"),
.enableUpcomingFeature("InferSendableFromCaptures"),
])

if strictConcurrencyDevelopment {
// -warnings-as-errors here is a workaround so that IDE-based development can
// get tripped up on -require-explicit-sendable.
initialSettings.append(.unsafeFlags(["-require-explicit-sendable", "-warnings-as-errors"]))
}

return initialSettings
}()

let package = Package(
name: "swift-nio-http2",
products: [
.library(name: "NIOHTTP2", targets: ["NIOHTTP2"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.60.0"),
.package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
],
targets: [
Expand Down Expand Up @@ -74,7 +92,8 @@ let package = Package(
.product(name: "NIOHTTP1", package: "swift-nio"),
.product(name: "NIOFoundationCompat", package: "swift-nio"),
.product(name: "Atomics", package: "swift-atomics"),
]
],
swiftSettings: strictConcurrencySettings
),
.testTarget(
name: "NIOHPACKTests",
Expand All @@ -86,7 +105,8 @@ let package = Package(
resources: [
.copy("Fixtures/large_complex_huffman_b64.txt"),
.copy("Fixtures/large_huffman_b64.txt"),
]
],
swiftSettings: strictConcurrencySettings
),
]
)
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOHPACK/HPACKErrors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import NIOCore
public protocol NIOHPACKError: Error, Equatable {}

/// Errors raised by NIOHPACK while encoding/decoding data.
public enum NIOHPACKErrors {
public enum NIOHPACKErrors: Sendable {
/// An indexed header referenced an index that doesn't exist in our
/// header tables.
public struct InvalidHeaderIndex: NIOHPACKError {
Expand Down