mirror
/
swift-metrics
mirror of https://github.com/apple/swift-metrics.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 5.10 compile on Ubuntu 24.04 (#168) 

Specifically Swift 5.10 on Intel on Ubuntu Noble (24.04) has a crazy bug
which leads to compilation failures in a #if compiler(>=6.0) block:
swiftlang/swift#79285 .

This workaround fixes the compilation by changing the whitespace.

Fixes https://github.com/apple/swift-metrics/issues/166
This commit is contained in:
Franz Busch 2025-03-18 16:21:52 +01:00 committed by GitHub
parent 3c0f419970
commit 44491db7cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/Metrics/Metrics.swift
View File

@ -11,6 +11,9 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// swift-format-ignore-file
// Note: Whitespace changes are used to workaround compiler bug
// https://github.com/swiftlang/swift/issues/79285
@_exported import CoreMetrics @_exported import CoreMetrics
import Foundation import Foundation
@ -123,8 +126,9 @@ extension Timer {
@available(macOS 13, iOS 16, tvOS 16, watchOS 9, *) @available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
public func measure<Result, Failure: Error, Clock: _Concurrency.Clock>( public func measure<Result, Failure: Error, Clock: _Concurrency.Clock>(
clock: Clock = .continuous, clock: Clock = .continuous,
body: () throws(Failure) -> Result // DO NOT FIX THE WHITESPACE IN THE NEXT LINE UNTIL 5.10 IS UNSUPPORTED
) throws(Failure) -> Result where Clock.Duration == Duration { // https://github.com/swiftlang/swift/issues/79285
body: () throws(Failure) -> Result) throws(Failure) -> Result where Clock.Duration == Duration {
let start = clock.now let start = clock.now
defer { defer {
self.record(duration: start.duration(to: clock.now)) self.record(duration: start.duration(to: clock.now))
@ -143,8 +147,9 @@ extension Timer {
public func measure<Result, Failure: Error, Clock: _Concurrency.Clock>( public func measure<Result, Failure: Error, Clock: _Concurrency.Clock>(
clock: Clock = .continuous, clock: Clock = .continuous,
isolation: isolated (any Actor)? = #isolation, isolation: isolated (any Actor)? = #isolation,
body: () async throws(Failure) -> sending Result // DO NOT FIX THE WHITESPACE IN THE NEXT LINE UNTIL 5.10 IS UNSUPPORTED
) async throws(Failure) -> sending Result where Clock.Duration == Duration { // https://github.com/swiftlang/swift/issues/79285
body: () async throws(Failure) -> sending Result) async throws(Failure) -> sending Result where Clock.Duration == Duration {
let start = clock.now let start = clock.now
defer { defer {
self.record(duration: start.duration(to: clock.now)) self.record(duration: start.duration(to: clock.now))