Skip to content

Commit 63c8fe3

Browse files
DougGregorDougGregor
committed
Clean up formatting in test cases
1 parent dba0a40 commit 63c8fe3

File tree

4 files changed

+75
-75
lines changed

4 files changed

+75
-75
lines changed

‎test/ModuleInterface/actor_availability.swift

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
// REQUIRES: VENDOR=apple
99

1010
// CHECK-NOT: #if compiler(>=5.3) && $Actors
11-
// CHECK: public actor ActorWithImplicitAvailability {
11+
// CHECK: public actor ActorWithImplicitAvailability {
1212
public actor ActorWithImplicitAvailability {
13-
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
13+
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
1414
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
1515
// CHECK-NEXT: get
1616
// CHECK-NEXT: }
1717
}
1818

19-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
20-
// CHECK: @available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
19+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
20+
// CHECK: @available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
2121
// CHECK-NEXT: public actor ActorWithExplicitAvailability {
2222
@available(SwiftStdlib 5.2, *)
2323
public actor ActorWithExplicitAvailability {
24-
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
24+
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
2525
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
2626
// CHECK-NEXT: get
2727
// CHECK-NEXT: }
2828
}
2929

30-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
31-
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
30+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
31+
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
3232
// CHECK-NEXT: public actor UnavailableActor {
3333
@available(macOS, unavailable)
3434
public actor UnavailableActor {
35-
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
35+
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
3636
// CHECK-NEXT: @available(macOS, unavailable, introduced: 10.15)
3737
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
3838
// CHECK-NEXT: get
@@ -44,7 +44,7 @@ public actor UnavailableActor {
4444
@available(SwiftStdlib 5.2, *)
4545
public enum Enum {
4646
// CHECK-NOT: #if compiler(>=5.3) && $Actors
47-
// CHECK: @_hasMissingDesignatedInitializers public actor NestedActor {
47+
// CHECK: @_hasMissingDesignatedInitializers public actor NestedActor {
4848
public actor NestedActor {
4949
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
5050
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
@@ -56,28 +56,28 @@ public enum Enum {
5656
// CHECK: extension Library.Enum {
5757
extension Enum {
5858
// CHECK-NOT: #if compiler(>=5.3) && $Actors
59-
// CHECK: @_hasMissingDesignatedInitializers public actor ExtensionNestedActor {
59+
// CHECK: @_hasMissingDesignatedInitializers public actor ExtensionNestedActor {
6060
public actor ExtensionNestedActor {
61-
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
61+
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
6262
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
6363
// CHECK-NEXT: get
6464
// CHECK-NEXT: }
6565
}
6666

67-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
68-
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
67+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
68+
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
6969
// CHECK-NEXT: public actor UnavailableExtensionNestedActor {
7070
@available(macOS, unavailable)
7171
public actor UnavailableExtensionNestedActor {
72-
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, *)
72+
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, *)
7373
// CHECK-NEXT: @available(macOS, unavailable, introduced: 10.15.4)
7474
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
7575
// CHECK-NEXT: get
7676
// CHECK-NEXT: }
7777
}
7878
}
7979

80-
// CHECK-PUBLIC: @available(macOS, unavailable)
80+
// CHECK-PUBLIC: @available(macOS, unavailable)
8181
// CHECK-PUBLIC-NEXT: @available(iOS, unavailable)
8282
// CHECK-PUBLIC-NEXT: @available(watchOS, unavailable)
8383
// CHECK-PUBLIC-NEXT: @available(tvOS, unavailable)
@@ -89,12 +89,12 @@ extension Enum {
8989
// CHECK-PRIVATE-NEXT: public struct SPIAvailableStruct
9090
@_spi_available(SwiftStdlib 5.2, *)
9191
public struct SPIAvailableStruct {
92-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
93-
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
92+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
93+
// CHECK: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
9494
// CHECK-NEXT: public actor UnavailableNestedActor
9595
@available(macOS, unavailable)
9696
public actor UnavailableNestedActor {
97-
// CHECK-PUBLIC: @available(iOS, unavailable)
97+
// CHECK-PUBLIC: @available(iOS, unavailable)
9898
// CHECK-PUBLIC-NEXT: @available(tvOS, unavailable)
9999
// CHECK-PUBLIC-NEXT: @available(watchOS, unavailable)
100100
// CHECK-PUBLIC-NEXT: @available(macOS, unavailable)
@@ -107,41 +107,41 @@ public struct SPIAvailableStruct {
107107
}
108108
}
109109

110-
// CHECK: @_hasMissingDesignatedInitializers @available(macCatalyst 13.1, *)
110+
// CHECK: @_hasMissingDesignatedInitializers @available(macCatalyst 13.1, *)
111111
// CHECK-NEXT: public class MacCatalystAvailableClass
112112
@available(macCatalyst 13.1, *)
113113
public class MacCatalystAvailableClass {
114114
// CHECK-NOT: #if compiler(>=5.3) && $Actors
115-
// CHECK: @_hasMissingDesignatedInitializers public actor NestedActor
115+
// CHECK: @_hasMissingDesignatedInitializers public actor NestedActor
116116
public actor NestedActor {
117-
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, macCatalyst 13.1, *)
117+
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, macCatalyst 13.1, *)
118118
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor
119119
}
120120

121-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
122-
// CHECK: @_hasMissingDesignatedInitializers @available(macCatalyst 14, *)
121+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
122+
// CHECK: @_hasMissingDesignatedInitializers @available(macCatalyst 14, *)
123123
// CHECK-NEXT: public actor LessAvailableMacCatalystActor
124124
@available(macCatalyst 14, *)
125125
public actor LessAvailableMacCatalystActor {
126-
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, macCatalyst 14, *)
126+
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, macCatalyst 14, *)
127127
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor
128128
}
129129

130130
// CHECK-NOT: #if compiler(>=5.3) && $Actors
131-
// CHECK: @_hasMissingDesignatedInitializers @available(iOS 15.0, macOS 12.0, *)
131+
// CHECK: @_hasMissingDesignatedInitializers @available(iOS 15.0, macOS 12.0, *)
132132
// CHECK-NEXT: public actor AvailableiOSAndMacOSNestedActor {
133133
@available(iOS 15.0, macOS 12.0, *)
134134
public actor AvailableiOSAndMacOSNestedActor {
135-
// CHECK: @available(iOS 15.0, tvOS 13.0, watchOS 6.0, macOS 12.0, *)
135+
// CHECK: @available(iOS 15.0, tvOS 13.0, watchOS 6.0, macOS 12.0, *)
136136
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor
137137
}
138138

139-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
140-
// CHECK: @_hasMissingDesignatedInitializers @available(iOS, unavailable)
139+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
140+
// CHECK: @_hasMissingDesignatedInitializers @available(iOS, unavailable)
141141
// CHECK-NEXT: public actor UnavailableiOSNestedActor
142142
@available(iOS, unavailable)
143143
public actor UnavailableiOSNestedActor {
144-
// CHECK: @available(tvOS 13.0, watchOS 6.0, macOS 10.15, *)
144+
// CHECK: @available(tvOS 13.0, watchOS 6.0, macOS 10.15, *)
145145
// CHECK-NEXT: @available(iOS, unavailable, introduced: 13.0)
146146
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor
147147
}

‎test/ModuleInterface/distributed-actor.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import Distributed
99

10-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
11-
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
10+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
11+
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
1212
// CHECK-NEXT: distributed public actor DA {
1313
@available(SwiftStdlib 5.7, *)
1414
public distributed actor DA {
@@ -32,12 +32,12 @@ public distributed actor DA {
3232
}
3333

3434

35-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
36-
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
37-
// CHECK-NEXT: extension Library.DA : Distributed.DistributedActor {}
38-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
39-
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
40-
// CHECK-NEXT: extension Library.DA : Swift.Encodable {}
41-
// CHECK-NOT: #if compiler(>=5.3) && $Actors
42-
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
43-
// CHECK-NEXT: extension Library.DA : Swift.Decodable {}
35+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
36+
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
37+
// CHECK-NEXT:extension Library.DA : Distributed.DistributedActor {}
38+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
39+
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
40+
// CHECK-NEXT:extension Library.DA : Swift.Encodable {}
41+
// CHECK-NOT: #if compiler(>=5.3) && $Actors
42+
// CHECK: @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
43+
// CHECK-NEXT:extension Library.DA : Swift.Decodable {}

‎test/ModuleInterface/effectful_properties.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public struct MyStruct {}
66

7-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
7+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
88
// CHECK: public var status: Swift.Bool {
99
// CHECK: get async throws
1010
// CHECK: }
@@ -15,13 +15,13 @@ public extension MyStruct {
1515
}
1616
}
1717

18-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
18+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
1919
// CHECK: public var hello: Swift.Int {
2020
// CHECK: get async
2121
// CHECK: }
2222

2323

24-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
24+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
2525
// CHECK: public subscript(x: Swift.Int) -> Swift.Void {
2626
// CHECK: get async throws
2727
// CHECK: }
@@ -34,7 +34,7 @@ public class C {
3434
}
3535
}
3636

37-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
37+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
3838
// CHECK: public var world: Swift.Int {
3939
// CHECK: get throws
4040
// CHECK: }
@@ -43,11 +43,11 @@ public enum E {
4343
public var world: Int { get throws { 0 } }
4444
}
4545

46-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
46+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
4747
// CHECK: var books: Swift.Int { get async }
4848

4949

50-
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
50+
// CHECK-NOT: #if compiler(>=5.3) && $EffectfulProp
5151
// CHECK: subscript(x: Swift.Int) -> Swift.Int { get throws }
5252

5353
public protocol P {

‎test/ModuleInterface/features.swift

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public func specializeWithAvailability<T>(_ t: T) {
2121
}
2222

2323
// CHECK-NOT: #if compiler(>=5.3) && $Actors
24-
// CHECK: public actor MyActor
24+
// CHECK: public actor MyActor
2525
// CHECK: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
2626
// CHECK-NEXT: get
2727
// CHECK-NEXT: }
@@ -30,32 +30,32 @@ public actor MyActor {
3030
}
3131

3232
// CHECK-NOT: #if compiler(>=5.3) && $Actors
33-
// CHECK: extension FeatureTest.MyActor
33+
// CHECK: extension FeatureTest.MyActor
3434
public extension MyActor {
3535
// CHECK-NOT: $Actors
36-
// CHECK: testFunc
36+
// CHECK: testFunc
3737
func testFunc() async { }
3838
// CHECK: }
3939
}
4040

4141
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
42-
// CHECK: globalAsync
42+
// CHECK: globalAsync
4343
public func globalAsync() async { }
4444

45-
// CHECK: @_marker public protocol MP {
45+
// CHECK: @_marker public protocol MP {
4646
// CHECK-NEXT: }
4747
@_marker public protocol MP { }
4848

49-
// CHECK: @_marker public protocol MP2 : FeatureTest.MP {
49+
// CHECK: @_marker public protocol MP2 : FeatureTest.MP {
5050
// CHECK-NEXT: }
5151
@_marker public protocol MP2: MP { }
5252

5353
// CHECK-NOT: #if compiler(>=5.3) && $MarkerProtocol
54-
// CHECK: public protocol MP3 : AnyObject, FeatureTest.MP {
54+
// CHECK: public protocol MP3 : AnyObject, FeatureTest.MP {
5555
// CHECK-NEXT: }
5656
public protocol MP3: AnyObject, MP { }
5757

58-
// CHECK: extension FeatureTest.MP2 {
58+
// CHECK: extension FeatureTest.MP2 {
5959
// CHECK-NEXT: func inMP2
6060
extension MP2 {
6161
public func inMP2() { }
@@ -64,43 +64,43 @@ extension MP2 {
6464
// CHECK: class OldSchool : FeatureTest.MP {
6565
public class OldSchool: MP {
6666
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
67-
// CHECK: takeClass()
67+
// CHECK: takeClass()
6868
public func takeClass() async { }
6969
}
7070

7171
// CHECK: class OldSchool2 : FeatureTest.MP {
7272
public class OldSchool2: MP {
7373
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
74-
// CHECK: takeClass()
74+
// CHECK: takeClass()
7575
public func takeClass() async { }
7676
}
7777

78-
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
78+
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
7979
// CHECK-NEXT: @rethrows public protocol RP
8080
@rethrows public protocol RP {
8181
func f() throws -> Bool
8282
}
8383

8484
// CHECK: public struct UsesRP {
8585
public struct UsesRP {
86-
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
86+
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
8787
// CHECK-NEXT: public var value: (any FeatureTest.RP)? {
8888
// CHECK-NOT: #if compiler(>=5.3) && $RethrowsProtocol
89-
// CHECK: get
89+
// CHECK: get
9090
public var value: RP? {
9191
nil
9292
}
9393
}
9494

95-
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
95+
// CHECK: #if compiler(>=5.3) && $RethrowsProtocol
9696
// CHECK-NEXT: public struct IsRP
9797
public struct IsRP: RP {
9898
// CHECK-NEXT: public func f()
9999
public func f() -> Bool { }
100100

101101
// CHECK-NOT: $RethrowsProtocol
102-
// CHECK-NEXT: public var isF:
103-
// CHECK-NEXT: get
102+
// CHECK-NEXT: public var isF:
103+
// CHECK-NEXT: get
104104
public var isF: Bool {
105105
f()
106106
}
@@ -111,43 +111,43 @@ public struct IsRP: RP {
111111
public func acceptsRP<T: RP>(_: T) { }
112112

113113
// CHECK-NOT: #if compiler(>=5.3) && $MarkerProtocol
114-
// CHECK: extension Swift.Array : FeatureTest.MP where Element : FeatureTest.MP {
114+
// CHECK: extension Swift.Array : FeatureTest.MP where Element : FeatureTest.MP {
115115
extension Array: FeatureTest.MP where Element : FeatureTest.MP { }
116116
// CHECK: }
117117

118118
// CHECK-NOT: #if compiler(>=5.3) && $MarkerProtocol
119-
// CHECK: extension FeatureTest.OldSchool : Swift.UnsafeSendable {
119+
// CHECK: extension FeatureTest.OldSchool : Swift.UnsafeSendable {
120120
extension OldSchool: UnsafeSendable { }
121121
// CHECK-NEXT: }
122122

123123

124124
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
125-
// CHECK: func runSomethingSomewhere
125+
// CHECK: func runSomethingSomewhere
126126
public func runSomethingSomewhere(body: () async -> Void) { }
127127

128128
// CHECK-NOT: #if compiler(>=5.3) && $Sendable
129-
// CHECK: func runSomethingConcurrently(body: @Sendable () ->
129+
// CHECK: func runSomethingConcurrently(body: @Sendable () ->
130130
public func runSomethingConcurrently(body: @Sendable () -> Void) { }
131131

132132
// CHECK-NOT: #if compiler(>=5.3) && $Actors
133-
// CHECK: func stage
133+
// CHECK: func stage
134134
public func stage(with actor: MyActor) { }
135135

136136
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait && $Sendable && $InheritActorContext
137-
// CHECK: func asyncIsh
137+
// CHECK: func asyncIsh
138138
public func asyncIsh(@_inheritActorContext operation: @Sendable @escaping () async -> Void) { }
139139

140-
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
141-
// CHECK: #if compiler(>=5.3) && $UnsafeInheritExecutor
142-
// CHECK: @_unsafeInheritExecutor public func unsafeInheritExecutor() async
140+
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
141+
// CHECK: #if compiler(>=5.3) && $UnsafeInheritExecutor
142+
// CHECK: @_unsafeInheritExecutor public func unsafeInheritExecutor() async
143143
@_unsafeInheritExecutor
144144
public func unsafeInheritExecutor() async {}
145145

146-
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
146+
// CHECK-NOT: #if compiler(>=5.3) && $AsyncAwait
147147
// CHECK-NOT: #if $UnsafeInheritExecutor
148-
// CHECK: #elseif compiler(>=5.3) && $SpecializeAttributeWithAvailability
149-
// CHECK: @_specialize{{.*}}
150-
// CHECK: public func multipleSuppressible<T>(value: T) async
148+
// CHECK: #elseif compiler(>=5.3) && $SpecializeAttributeWithAvailability
149+
// CHECK: @_specialize{{.*}}
150+
// CHECK: public func multipleSuppressible<T>(value: T) async
151151
@_unsafeInheritExecutor
152152
@_specialize(exported: true, availability: SwiftStdlib 5.1, *; where T == Int)
153153
public func multipleSuppressible<T>(value: T) async {}

0 commit comments

Comments
 (0)