Skip to content

Commit 403fc5e

Browse files
authored
Merge pull request #1021 from ahoppen/ahoppen/retroactive-5.11
Guard usages of `@retroactive` by Swift 5.11, not 5.10
2 parents fa71f01 + 4b32dfe commit 403fc5e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Sources/LSPTestSupport/TestJSONRPCConnection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private let testMessageRegistry = MessageRegistry(
178178
notifications: [EchoNotification.self]
179179
)
180180

181-
#if swift(<5.10)
181+
#if swift(<5.11)
182182
extension String: ResponseType {}
183183
#else
184184
extension String: @retroactive ResponseType {}

Sources/SKSupport/DocumentURI+CustomLogStringConvertible.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension DocumentURI {
2121
return "<DocumentURI length=\(description.count) hash=\(description.hashForLogging)>"
2222
}
2323
}
24-
#if swift(<5.10)
24+
#if swift(<5.11)
2525
extension DocumentURI: CustomLogStringConvertible {}
2626
#else
2727
extension DocumentURI: @retroactive CustomLogStringConvertible {}

Sources/SourceKitLSP/IndexStoreDB+MainFilesProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extension IndexStoreDB {
3131
}
3232
}
3333

34-
#if swift(<5.10)
34+
#if swift(<5.11)
3535
extension IndexStoreDB: MainFilesProvider {}
3636
#else
3737
extension IndexStoreDB: @retroactive MainFilesProvider {}

Sources/sourcekit-lsp/SourceKitLSP.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension AbsolutePath {
4848
.directory
4949
}
5050
}
51-
#if swift(<5.10)
51+
#if swift(<5.11)
5252
extension AbsolutePath: ExpressibleByArgument {}
5353
#else
5454
extension AbsolutePath: @retroactive ExpressibleByArgument {}
@@ -65,7 +65,7 @@ extension RelativePath {
6565
self = path
6666
}
6767
}
68-
#if swift(<5.10)
68+
#if swift(<5.11)
6969
extension RelativePath: ExpressibleByArgument {}
7070
#else
7171
extension RelativePath: @retroactive ExpressibleByArgument {}
@@ -80,19 +80,19 @@ extension PathPrefixMapping {
8080
)
8181
}
8282
}
83-
#if swift(<5.10)
83+
#if swift(<5.11)
8484
extension PathPrefixMapping: ExpressibleByArgument {}
8585
#else
8686
extension PathPrefixMapping: @retroactive ExpressibleByArgument {}
8787
#endif
8888

89-
#if swift(<5.10)
89+
#if swift(<5.11)
9090
extension SKSupport.BuildConfiguration: ExpressibleByArgument {}
9191
#else
9292
extension SKSupport.BuildConfiguration: @retroactive ExpressibleByArgument {}
9393
#endif
9494

95-
#if swift(<5.10)
95+
#if swift(<5.11)
9696
extension SKSupport.WorkspaceType: ExpressibleByArgument {}
9797
#else
9898
extension SKSupport.WorkspaceType: @retroactive ExpressibleByArgument {}

0 commit comments

Comments
 (0)