Skip to content

Commit f715b97

Browse files
ahoppenahoppen
committed
Use fully-qualified types instead of @retroactive conformances
When increasing the tools version of swift-syntax to 5.9 or higher, the package is built with `-package-name`. It appears that conformances within the same package domain are not considered retroactive, which means that the addition of `@retroactive` produces a compilation error. To allow swift-syntax to build both within a single package domain and without, use fully-qualified types instead of `@retroactive` in the potentially retroactive conformances. Fixes #2844
1 parent f37d4de commit f715b97

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(le
4343
DeclSyntax(
4444
"""
4545
#if compiler(>=6)
46-
extension \(type): @retroactive ExpressibleByStringInterpolation {}
46+
extension \(type): Swift.ExpressibleByStringInterpolation {}
4747
#endif
4848
"""
4949
)

‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ extension BooleanLiteralExprSyntax {
8383
}
8484
}
8585
#if compiler(>=6)
86-
extension BooleanLiteralExprSyntax: @retroactive ExpressibleByBooleanLiteral {}
86+
extension BooleanLiteralExprSyntax: Swift.ExpressibleByBooleanLiteral {}
8787
#else
8888
extension BooleanLiteralExprSyntax: ExpressibleByBooleanLiteral {}
8989
#endif
@@ -184,7 +184,7 @@ extension FloatLiteralExprSyntax {
184184
}
185185

186186
#if compiler(>=6)
187-
extension FloatLiteralExprSyntax: @retroactive ExpressibleByFloatLiteral {}
187+
extension FloatLiteralExprSyntax: Swift.ExpressibleByFloatLiteral {}
188188
#else
189189
extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {}
190190
#endif
@@ -227,7 +227,7 @@ extension IntegerLiteralExprSyntax {
227227
}
228228

229229
#if compiler(>=6)
230-
extension IntegerLiteralExprSyntax: @retroactive ExpressibleByIntegerLiteral {}
230+
extension IntegerLiteralExprSyntax: Swift.ExpressibleByIntegerLiteral {}
231231
#else
232232
extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {}
233233
#endif

‎Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ extension TokenSyntax: SyntaxExpressibleByStringInterpolation {
466466
#if compiler(>=6)
467467
// Silence warning that TokenSyntax has a retroactive conformance to `ExpressibleByStringInterpolation` through
468468
// `SyntaxExpressibleByStringInterpolation`.
469-
extension TokenSyntax: @retroactive ExpressibleByStringInterpolation {}
469+
extension TokenSyntax: Swift.ExpressibleByStringInterpolation {}
470470
#endif
471471

472472
// MARK: - Trivia expressible as string
@@ -515,7 +515,7 @@ extension Trivia {
515515
}
516516

517517
#if compiler(>=6)
518-
extension Trivia: @retroactive ExpressibleByStringInterpolation {}
518+
extension Trivia: Swift.ExpressibleByStringInterpolation {}
519519
#else
520520
extension Trivia: ExpressibleByStringInterpolation {}
521521
#endif

‎Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,138 +21,138 @@ import SwiftSyntax
2121
extension AccessorBlockSyntax: SyntaxExpressibleByStringInterpolation {}
2222

2323
#if compiler(>=6)
24-
extension AccessorBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
24+
extension AccessorBlockSyntax: Swift.ExpressibleByStringInterpolation {}
2525
#endif
2626

2727
extension AccessorDeclSyntax: SyntaxExpressibleByStringInterpolation {}
2828

2929
#if compiler(>=6)
30-
extension AccessorDeclSyntax: @retroactive ExpressibleByStringInterpolation {}
30+
extension AccessorDeclSyntax: Swift.ExpressibleByStringInterpolation {}
3131
#endif
3232

3333
extension AttributeSyntax: SyntaxExpressibleByStringInterpolation {}
3434

3535
#if compiler(>=6)
36-
extension AttributeSyntax: @retroactive ExpressibleByStringInterpolation {}
36+
extension AttributeSyntax: Swift.ExpressibleByStringInterpolation {}
3737
#endif
3838

3939
extension CatchClauseSyntax: SyntaxExpressibleByStringInterpolation {}
4040

4141
#if compiler(>=6)
42-
extension CatchClauseSyntax: @retroactive ExpressibleByStringInterpolation {}
42+
extension CatchClauseSyntax: Swift.ExpressibleByStringInterpolation {}
4343
#endif
4444

4545
extension ClosureParameterSyntax: SyntaxExpressibleByStringInterpolation {}
4646

4747
#if compiler(>=6)
48-
extension ClosureParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
48+
extension ClosureParameterSyntax: Swift.ExpressibleByStringInterpolation {}
4949
#endif
5050

5151
extension CodeBlockItemSyntax: SyntaxExpressibleByStringInterpolation {}
5252

5353
#if compiler(>=6)
54-
extension CodeBlockItemSyntax: @retroactive ExpressibleByStringInterpolation {}
54+
extension CodeBlockItemSyntax: Swift.ExpressibleByStringInterpolation {}
5555
#endif
5656

5757
extension CodeBlockSyntax: SyntaxExpressibleByStringInterpolation {}
5858

5959
#if compiler(>=6)
60-
extension CodeBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
60+
extension CodeBlockSyntax: Swift.ExpressibleByStringInterpolation {}
6161
#endif
6262

6363
extension DeclSyntax: SyntaxExpressibleByStringInterpolation {}
6464

6565
#if compiler(>=6)
66-
extension DeclSyntax: @retroactive ExpressibleByStringInterpolation {}
66+
extension DeclSyntax: Swift.ExpressibleByStringInterpolation {}
6767
#endif
6868

6969
extension EnumCaseParameterSyntax: SyntaxExpressibleByStringInterpolation {}
7070

7171
#if compiler(>=6)
72-
extension EnumCaseParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
72+
extension EnumCaseParameterSyntax: Swift.ExpressibleByStringInterpolation {}
7373
#endif
7474

7575
extension ExprSyntax: SyntaxExpressibleByStringInterpolation {}
7676

7777
#if compiler(>=6)
78-
extension ExprSyntax: @retroactive ExpressibleByStringInterpolation {}
78+
extension ExprSyntax: Swift.ExpressibleByStringInterpolation {}
7979
#endif
8080

8181
extension FunctionParameterSyntax: SyntaxExpressibleByStringInterpolation {}
8282

8383
#if compiler(>=6)
84-
extension FunctionParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
84+
extension FunctionParameterSyntax: Swift.ExpressibleByStringInterpolation {}
8585
#endif
8686

8787
extension GenericParameterClauseSyntax: SyntaxExpressibleByStringInterpolation {}
8888

8989
#if compiler(>=6)
90-
extension GenericParameterClauseSyntax: @retroactive ExpressibleByStringInterpolation {}
90+
extension GenericParameterClauseSyntax: Swift.ExpressibleByStringInterpolation {}
9191
#endif
9292

9393
extension MemberBlockSyntax: SyntaxExpressibleByStringInterpolation {}
9494

9595
#if compiler(>=6)
96-
extension MemberBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
96+
extension MemberBlockSyntax: Swift.ExpressibleByStringInterpolation {}
9797
#endif
9898

9999
extension PatternSyntax: SyntaxExpressibleByStringInterpolation {}
100100

101101
#if compiler(>=6)
102-
extension PatternSyntax: @retroactive ExpressibleByStringInterpolation {}
102+
extension PatternSyntax: Swift.ExpressibleByStringInterpolation {}
103103
#endif
104104

105105
extension SourceFileSyntax: SyntaxExpressibleByStringInterpolation {}
106106

107107
#if compiler(>=6)
108-
extension SourceFileSyntax: @retroactive ExpressibleByStringInterpolation {}
108+
extension SourceFileSyntax: Swift.ExpressibleByStringInterpolation {}
109109
#endif
110110

111111
extension StmtSyntax: SyntaxExpressibleByStringInterpolation {}
112112

113113
#if compiler(>=6)
114-
extension StmtSyntax: @retroactive ExpressibleByStringInterpolation {}
114+
extension StmtSyntax: Swift.ExpressibleByStringInterpolation {}
115115
#endif
116116

117117
extension SwitchCaseSyntax: SyntaxExpressibleByStringInterpolation {}
118118

119119
#if compiler(>=6)
120-
extension SwitchCaseSyntax: @retroactive ExpressibleByStringInterpolation {}
120+
extension SwitchCaseSyntax: Swift.ExpressibleByStringInterpolation {}
121121
#endif
122122

123123
extension TypeSyntax: SyntaxExpressibleByStringInterpolation {}
124124

125125
#if compiler(>=6)
126-
extension TypeSyntax: @retroactive ExpressibleByStringInterpolation {}
126+
extension TypeSyntax: Swift.ExpressibleByStringInterpolation {}
127127
#endif
128128

129129
extension VersionTupleSyntax: SyntaxExpressibleByStringInterpolation {}
130130

131131
#if compiler(>=6)
132-
extension VersionTupleSyntax: @retroactive ExpressibleByStringInterpolation {}
132+
extension VersionTupleSyntax: Swift.ExpressibleByStringInterpolation {}
133133
#endif
134134

135135
extension AccessorDeclListSyntax: SyntaxExpressibleByStringInterpolation {}
136136

137137
#if compiler(>=6)
138-
extension AccessorDeclListSyntax: @retroactive ExpressibleByStringInterpolation {}
138+
extension AccessorDeclListSyntax: Swift.ExpressibleByStringInterpolation {}
139139
#endif
140140

141141
extension AttributeListSyntax: SyntaxExpressibleByStringInterpolation {}
142142

143143
#if compiler(>=6)
144-
extension AttributeListSyntax: @retroactive ExpressibleByStringInterpolation {}
144+
extension AttributeListSyntax: Swift.ExpressibleByStringInterpolation {}
145145
#endif
146146

147147
extension CodeBlockItemListSyntax: SyntaxExpressibleByStringInterpolation {}
148148

149149
#if compiler(>=6)
150-
extension CodeBlockItemListSyntax: @retroactive ExpressibleByStringInterpolation {}
150+
extension CodeBlockItemListSyntax: Swift.ExpressibleByStringInterpolation {}
151151
#endif
152152

153153
extension MemberBlockItemListSyntax: SyntaxExpressibleByStringInterpolation {}
154154

155155
#if compiler(>=6)
156-
extension MemberBlockItemListSyntax: @retroactive ExpressibleByStringInterpolation {}
156+
extension MemberBlockItemListSyntax: Swift.ExpressibleByStringInterpolation {}
157157
#endif
158158

0 commit comments

Comments
 (0)