Skip to content

[6.1] [stdlib] Add Comparable conformance to WordPair #79189

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
merged 4 commits into from
Feb 18, 2025
Merged

[6.1] [stdlib] Add Comparable conformance to WordPair #79189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1311f7
Merge pull request #78857 from Azoy/wordpair-comparable
Azoy Jan 29, 2025
9cca90c
Use 6.1 availability
Azoy Feb 6, 2025
6d099d0
Update test/stdlib/Synchronization/Atomics/WordPair.swift
Azoy Feb 13, 2025
c6f03a4
Update test/stdlib/Synchronization/Atomics/WordPair.swift
Azoy Feb 13, 2025
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
10 changes: 10 additions & 0 deletions stdlib/public/Synchronization/Atomics/WordPair.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,16 @@ extension WordPair: Hashable {
}
}

@available(SwiftStdlib 6.1, *)
extension WordPair: Comparable {
@available(SwiftStdlib 6.1, *)
@_alwaysEmitIntoClient
@_transparent
public static func <(lhs: WordPair, rhs: WordPair) -> Bool {
(lhs.first, lhs.second) < (rhs.first, rhs.second)
}
}

@available(SwiftStdlib 6.0, *)
@_unavailableInEmbedded
extension WordPair: CustomStringConvertible {
Expand Down
3 changes: 3 additions & 0 deletions test/abi/macOS/arm64/synchronization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,3 +698,6 @@ Added: _$s15Synchronization20AtomicUpdateOrderingV22sequentiallyConsistentACvpZM
Added: _$s15Synchronization20AtomicUpdateOrderingV7relaxedACvpZMV
Added: _$s15Synchronization20AtomicUpdateOrderingV9acquiringACvpZMV
Added: _$s15Synchronization20AtomicUpdateOrderingV9releasingACvpZMV

// WordPair to Comparable conformance
Added: _$s15Synchronization8WordPairVSLAAMc
3 changes: 3 additions & 0 deletions test/abi/macOS/x86_64/synchronization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,3 +692,6 @@ Added: _$s15Synchronization20AtomicUpdateOrderingV22sequentiallyConsistentACvpZM
Added: _$s15Synchronization20AtomicUpdateOrderingV7relaxedACvpZMV
Added: _$s15Synchronization20AtomicUpdateOrderingV9acquiringACvpZMV
Added: _$s15Synchronization20AtomicUpdateOrderingV9releasingACvpZMV

// WordPair to Comparable conformance
Added: _$s15Synchronization8WordPairVSLAAMc
18 changes: 18 additions & 0 deletions test/stdlib/Synchronization/Atomics/WordPair.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,22 @@ suite.test("basics") {

} // if #available(SwiftStdlib 6.0, *)

if #available(SwiftStdlib 6.1, *) {
suite.test("comparable") {
let c0 = WordPair(first: 0, second: 0)
let c1 = WordPair(first: 1, second: 0)
let c2 = WordPair(first: 2, second: 0)
let c3 = WordPair(first: 0, second: 1)
let c4 = WordPair(first: 1, second: 2)
let c5 = WordPair(first: 2, second: 1)
expectFalse(c0 < c0)
expectTrue(c0 < c1)
expectTrue(c0 < c2)
expectTrue(c0 < c3)
expectFalse(c1 < c0)
expectTrue(c4 < c5)
expectFalse(c5 < c4)
}
} // if #available(SwiftStdlib 6.1, *)

runAllTests()