Skip to content

Commit e66e958

Browse files
ktosoktoso
committed
[Distributed] Remove "Stdlib" in macro as it is not understood in user code
Now that the versions are merged already on github, we must adjust all related code, such as the distributed @resolvable macro because the "Stdlib" placeholder is not understood in real user code where the macro would be emitting this.
1 parent 1f9305f commit e66e958

4 files changed

+13
-13
lines changed

‎lib/Macros/Sources/SwiftMacros/DistributedResolvableMacro.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ extension DistributedResolvableMacro {
104104

105105
static func stubFunctionBody() -> DeclSyntax {
106106
"""
107-
if #available(SwiftStdlib 6.0, *) {
107+
if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
108108
Distributed._distributedStubFatalError()
109109
} else {
110110
fatalError()

‎test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_inheritance.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protocol Base: DistributedActor where ActorSystem: DistributedActorSystem<any Co
2525

2626
// CHECK: extension Base where Self: Distributed._DistributedActorStub {
2727
// CHECK: distributed func base() -> Int {
28-
// CHECK: if #available(SwiftStdlib 6.0, *) {
28+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
2929
// CHECK: Distributed._distributedStubFatalError()
3030
// CHECK: } else {
3131
// CHECK: fatalError()
@@ -49,14 +49,14 @@ protocol G3<ActorSystem>: DistributedActor, Base where ActorSystem: DistributedA
4949

5050
// CHECK: extension G3 where Self: Distributed._DistributedActorStub {
5151
// CHECK: distributed func get() -> String {
52-
// CHECK: if #available(SwiftStdlib 6.0, *) {
52+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
5353
// CHECK: Distributed._distributedStubFatalError()
5454
// CHECK: } else {
5555
// CHECK: fatalError()
5656
// CHECK: }
5757
// CHECK: }
5858
// CHECK: distributed func greet(name: String) -> String {
59-
// CHECK: if #available(SwiftStdlib 6.0, *) {
59+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
6060
// CHECK: Distributed._distributedStubFatalError()
6161
// CHECK: } else {
6262
// CHECK: fatalError()

‎test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_simple.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protocol Greeter: DistributedActor where ActorSystem: DistributedActorSystem<any
2626

2727
// CHECK: extension Greeter where Self: Distributed._DistributedActorStub {
2828
// CHECK-NEXT: distributed func greet(name: String) -> String {
29-
// CHECK-NEXT: if #available(SwiftStdlib 6.0, *) {
29+
// CHECK-NEXT: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
3030
// CHECK-NEXT: Distributed._distributedStubFatalError()
3131
// CHECK-NEXT: } else {
3232
// CHECK-NEXT: fatalError()

‎test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_various_requirements.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protocol Greeter: DistributedActor where ActorSystem == FakeActorSystem {
2424

2525
// CHECK: extension Greeter where Self: Distributed._DistributedActorStub {
2626
// CHECK: distributed func greet(name: String) -> String {
27-
// CHECK: if #available(SwiftStdlib 6.0, *) {
27+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
2828
// CHECK: Distributed._distributedStubFatalError()
2929
// CHECK: } else {
3030
// CHECK: fatalError()
@@ -44,7 +44,7 @@ protocol Greeter2: DistributedActor where ActorSystem: DistributedActorSystem<an
4444

4545
// CHECK: extension Greeter2 where Self: Distributed._DistributedActorStub {
4646
// CHECK: distributed func greet(name: String) -> String {
47-
// CHECK: if #available(SwiftStdlib 6.0, *) {
47+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
4848
// CHECK: Distributed._distributedStubFatalError()
4949
// CHECK: } else {
5050
// CHECK: fatalError()
@@ -69,7 +69,7 @@ protocol Greeter3: DistributedActor where ActorSystem: DistributedActorSystem<an
6969

7070
// CHECK: extension Greeter3 where Self: Distributed._DistributedActorStub {
7171
// CHECK: distributed func greet(name: String) -> String {
72-
// CHECK: if #available(SwiftStdlib 6.0, *) {
72+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
7373
// CHECK: Distributed._distributedStubFatalError()
7474
// CHECK: } else {
7575
// CHECK: fatalError()
@@ -89,7 +89,7 @@ public protocol Greeter4: DistributedActor where ActorSystem == FakeActorSystem
8989

9090
// CHECK: extension Greeter4 where Self: Distributed._DistributedActorStub {
9191
// CHECK: public distributed func greet(name: String) -> String {
92-
// CHECK: if #available(SwiftStdlib 6.0, *) {
92+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
9393
// CHECK: Distributed._distributedStubFatalError()
9494
// CHECK: } else {
9595
// CHECK: fatalError()
@@ -112,28 +112,28 @@ public protocol GreeterMore: DistributedActor where ActorSystem == FakeActorSyst
112112

113113
// CHECK: extension GreeterMore where Self: Distributed._DistributedActorStub {
114114
// CHECK: public distributed var name : String {
115-
// CHECK: if #available(SwiftStdlib 6.0, *) {
115+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
116116
// CHECK: Distributed._distributedStubFatalError()
117117
// CHECK: } else {
118118
// CHECK: fatalError()
119119
// CHECK: }
120120
// CHECK: }
121121
// CHECK: public distributed func greet(name: String) -> String {
122-
// CHECK: if #available(SwiftStdlib 6.0, *) {
122+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
123123
// CHECK: Distributed._distributedStubFatalError()
124124
// CHECK: } else {
125125
// CHECK: fatalError()
126126
// CHECK: }
127127
// CHECK: }
128128
// CHECK: public distributed func another(string: String, int: Int) async throws -> Double {
129-
// CHECK: if #available(SwiftStdlib 6.0, *) {
129+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
130130
// CHECK: Distributed._distributedStubFatalError()
131131
// CHECK: } else {
132132
// CHECK: fatalError()
133133
// CHECK: }
134134
// CHECK: }
135135
// CHECK: public distributed func generic<T: Codable>(value: T, int: Int) async throws -> T {
136-
// CHECK: if #available(SwiftStdlib 6.0, *) {
136+
// CHECK: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
137137
// CHECK: Distributed._distributedStubFatalError()
138138
// CHECK: } else {
139139
// CHECK: fatalError()

0 commit comments

Comments
 (0)