Skip to content

Commit 71cfb1e

Browse files
Existential any to protocol for Swift 6 (pointfreeco#3370)
* Apply existential any to protocol for Swift 6 * Update Package@swift-6.0.swift * Update Package.swift * Apply any to Macro.Type * Apply any for the rest * Applying the any keyword internally for typealias in a _KeyPath * Undoing accidental syntax --------- Co-authored-by: Stephen Celis <stephen@stephencelis.com> Co-authored-by: Stephen Celis <stephen.celis@gmail.com>
1 parent af07aa9 commit 71cfb1e

File tree

44 files changed

+83
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+83
-76
lines changed

Examples/CaseStudies/SwiftUICaseStudies/02-SharedState-Notifications.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct SharedStateNotifications {
2424
@SharedReader(.screenshotCount) var screenshotCount = 0
2525
}
2626
enum Action {
27-
case factResponse(Result<String, Error>)
27+
case factResponse(Result<String, any Error>)
2828
case onAppear
2929
}
3030
@Dependency(\.factClient) var factClient

Examples/CaseStudies/SwiftUICaseStudies/03-Effects-Basics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct EffectsBasics {
3232
case decrementDelayResponse
3333
case incrementButtonTapped
3434
case numberFactButtonTapped
35-
case numberFactResponse(Result<String, Error>)
35+
case numberFactResponse(Result<String, any Error>)
3636
}
3737

3838
@Dependency(\.continuousClock) var clock

Examples/CaseStudies/SwiftUICaseStudies/03-Effects-Cancellation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct EffectsCancellation {
2525
case cancelButtonTapped
2626
case stepperChanged(Int)
2727
case factButtonTapped
28-
case factResponse(Result<String, Error>)
28+
case factResponse(Result<String, any Error>)
2929
}
3030

3131
@Dependency(\.factClient) var factClient

Examples/CaseStudies/SwiftUICaseStudies/03-Effects-Refreshable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct Refreshable {
2323
enum Action {
2424
case cancelButtonTapped
2525
case decrementButtonTapped
26-
case factResponse(Result<String, Error>)
26+
case factResponse(Result<String, any Error>)
2727
case incrementButtonTapped
2828
case refresh
2929
}

Examples/CaseStudies/SwiftUICaseStudies/03-Effects-WebSocket.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct WebSocket {
2929
case alert(PresentationAction<Alert>)
3030
case connectButtonTapped
3131
case messageToSendChanged(String)
32-
case receivedSocketMessage(Result<WebSocketClient.Message, Error>)
32+
case receivedSocketMessage(Result<WebSocketClient.Message, any Error>)
3333
case sendButtonTapped
3434
case sendResponse(didSucceed: Bool)
3535
case webSocket(WebSocketClient.Action)
@@ -227,7 +227,7 @@ struct WebSocketClient {
227227
var open: @Sendable (_ id: ID, _ url: URL, _ protocols: [String]) async -> AsyncStream<Action> = {
228228
_, _, _ in .finished
229229
}
230-
var receive: @Sendable (_ id: ID) async throws -> AsyncStream<Result<Message, Error>>
230+
var receive: @Sendable (_ id: ID) async throws -> AsyncStream<Result<Message, any Error>>
231231
var send: @Sendable (_ id: ID, _ message: URLSessionWebSocketTask.Message) async throws -> Void
232232
var sendPing: @Sendable (_ id: ID) async throws -> Void
233233
}
@@ -295,7 +295,7 @@ extension WebSocketClient: DependencyKey {
295295
try self.socket(id: id).cancel(with: closeCode, reason: reason)
296296
}
297297

298-
func receive(id: ID) throws -> AsyncStream<Result<Message, Error>> {
298+
func receive(id: ID) throws -> AsyncStream<Result<Message, any Error>> {
299299
let socket = try self.socket(id: id)
300300
return AsyncStream { continuation in
301301
let task = Task {

Examples/CaseStudies/SwiftUICaseStudies/04-NavigationStack.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ struct ScreenA {
190190
case dismissButtonTapped
191191
case incrementButtonTapped
192192
case factButtonTapped
193-
case factResponse(Result<String, Error>)
193+
case factResponse(Result<String, any Error>)
194194
}
195195

196196
@Dependency(\.dismiss) var dismiss

Examples/CaseStudies/SwiftUICaseStudies/05-HigherOrderReducers-ResuableOfflineDownloads/DownloadClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Foundation
33

44
@DependencyClient
55
struct DownloadClient {
6-
var download: @Sendable (_ url: URL) -> AsyncThrowingStream<Event, Error> = { _ in .finished() }
6+
var download: @Sendable (_ url: URL) -> AsyncThrowingStream<Event, any Error> = { _ in .finished() }
77

88
@CasePathable
99
enum Event: Equatable {

Examples/CaseStudies/SwiftUICaseStudies/05-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct DownloadComponent {
1414
enum Action {
1515
case alert(PresentationAction<Alert>)
1616
case buttonTapped
17-
case downloadClient(Result<DownloadClient.Event, Error>)
17+
case downloadClient(Result<DownloadClient.Event, any Error>)
1818

1919
@CasePathable
2020
enum Alert {

Examples/CaseStudies/SwiftUICaseStudies/05-HigherOrderReducers-ReusableFavoriting.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct FavoritingState<ID: Hashable & Sendable>: Equatable {
2828
enum FavoritingAction {
2929
case alert(PresentationAction<Alert>)
3030
case buttonTapped
31-
case response(Result<Bool, Error>)
31+
case response(Result<Bool, any Error>)
3232

3333
enum Alert: Equatable {}
3434
}

Examples/CaseStudies/SwiftUICaseStudiesTests/03-Effects-WebSocketTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import XCTest
66
final class WebSocketTests: XCTestCase {
77
func testWebSocketHappyPath() async {
88
let actions = AsyncStream.makeStream(of: WebSocketClient.Action.self)
9-
let messages = AsyncStream.makeStream(of: Result<WebSocketClient.Message, Error>.self)
9+
let messages = AsyncStream.makeStream(of: Result<WebSocketClient.Message, any Error>.self)
1010

1111
let store = await TestStore(initialState: WebSocket.State()) {
1212
WebSocket()
@@ -57,7 +57,7 @@ final class WebSocketTests: XCTestCase {
5757

5858
func testWebSocketSendFailure() async {
5959
let actions = AsyncStream.makeStream(of: WebSocketClient.Action.self)
60-
let messages = AsyncStream.makeStream(of: Result<WebSocketClient.Message, Error>.self)
60+
let messages = AsyncStream.makeStream(of: Result<WebSocketClient.Message, any Error>.self)
6161

6262
let store = await TestStore(initialState: WebSocket.State()) {
6363
WebSocket()

0 commit comments

Comments
 (0)