gronod
e203127794
Swift 6 rejected ProcessRunSupport.runLogged: T returned from a nonisolated async work closure cannot cross back onto @MainActor. Isolate work to MainActor so URL / PrinttargResult stay on-actor.
30 lines
1.0 KiB
Swift
30 lines
1.0 KiB
Swift
import Foundation
|
|
|
|
/// Shared hop for coalesced Argyll log batches (issue #80).
|
|
/// The runner invokes the sink off the main actor; this is the single hop back.
|
|
enum ProcessRunSupport {
|
|
static func logSink(
|
|
_ apply: @escaping @MainActor @Sendable ([String]) -> Void
|
|
) -> @Sendable ([String]) -> Void {
|
|
{ batch in
|
|
Task { @MainActor in apply(batch) }
|
|
}
|
|
}
|
|
|
|
/// Wraps a runner call with running/log bookkeeping.
|
|
/// `work` stays on the main actor so `T` does not cross isolation
|
|
/// (Swift 6: non-Sendable generic return from a nonisolated async fn).
|
|
@MainActor
|
|
static func runLogged<T>(
|
|
setRunning: (Bool) -> Void,
|
|
resetLog: () -> Void,
|
|
onLog: @escaping @MainActor @Sendable ([String]) -> Void,
|
|
work: @MainActor @escaping (@escaping @Sendable ([String]) -> Void) async throws -> T
|
|
) async throws -> T {
|
|
setRunning(true)
|
|
resetLog()
|
|
defer { setRunning(false) }
|
|
return try await work(logSink(onLog))
|
|
}
|
|
}
|