Skip to content

Use fully-qualified types instead of @retroactive conformances #2862

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 1 commit into from
Sep 27, 2024
Merged

Use fully-qualified types instead of @retroactive conformances #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(le
DeclSyntax(
"""
#if compiler(>=6)
extension \(type): @retroactive ExpressibleByStringInterpolation {}
extension \(type): Swift.ExpressibleByStringInterpolation {}
#endif
"""
)
Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extension BooleanLiteralExprSyntax {
}
}
#if compiler(>=6)
extension BooleanLiteralExprSyntax: @retroactive ExpressibleByBooleanLiteral {}
extension BooleanLiteralExprSyntax: Swift.ExpressibleByBooleanLiteral {}
#else
extension BooleanLiteralExprSyntax: ExpressibleByBooleanLiteral {}
#endif
Expand Down Expand Up @@ -184,7 +184,7 @@ extension FloatLiteralExprSyntax {
}

#if compiler(>=6)
extension FloatLiteralExprSyntax: @retroactive ExpressibleByFloatLiteral {}
extension FloatLiteralExprSyntax: Swift.ExpressibleByFloatLiteral {}
#else
extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {}
#endif
Expand Down Expand Up @@ -227,7 +227,7 @@ extension IntegerLiteralExprSyntax {
}

#if compiler(>=6)
extension IntegerLiteralExprSyntax: @retroactive ExpressibleByIntegerLiteral {}
extension IntegerLiteralExprSyntax: Swift.ExpressibleByIntegerLiteral {}
#else
extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {}
#endif
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ extension TokenSyntax: SyntaxExpressibleByStringInterpolation {
#if compiler(>=6)
// Silence warning that TokenSyntax has a retroactive conformance to `ExpressibleByStringInterpolation` through
// `SyntaxExpressibleByStringInterpolation`.
extension TokenSyntax: @retroactive ExpressibleByStringInterpolation {}
extension TokenSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

// MARK: - Trivia expressible as string
Expand Down Expand Up @@ -515,7 +515,7 @@ extension Trivia {
}

#if compiler(>=6)
extension Trivia: @retroactive ExpressibleByStringInterpolation {}
extension Trivia: Swift.ExpressibleByStringInterpolation {}
#else
extension Trivia: ExpressibleByStringInterpolation {}
#endif
46 changes: 23 additions & 23 deletions ...ces/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,138 +21,138 @@ import SwiftSyntax
extension AccessorBlockSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension AccessorBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
extension AccessorBlockSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension AccessorDeclSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension AccessorDeclSyntax: @retroactive ExpressibleByStringInterpolation {}
extension AccessorDeclSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension AttributeSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension AttributeSyntax: @retroactive ExpressibleByStringInterpolation {}
extension AttributeSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension CatchClauseSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension CatchClauseSyntax: @retroactive ExpressibleByStringInterpolation {}
extension CatchClauseSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension ClosureParameterSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension ClosureParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
extension ClosureParameterSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension CodeBlockItemSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension CodeBlockItemSyntax: @retroactive ExpressibleByStringInterpolation {}
extension CodeBlockItemSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension CodeBlockSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension CodeBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
extension CodeBlockSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension DeclSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension DeclSyntax: @retroactive ExpressibleByStringInterpolation {}
extension DeclSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension EnumCaseParameterSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension EnumCaseParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
extension EnumCaseParameterSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension ExprSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension ExprSyntax: @retroactive ExpressibleByStringInterpolation {}
extension ExprSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension FunctionParameterSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension FunctionParameterSyntax: @retroactive ExpressibleByStringInterpolation {}
extension FunctionParameterSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension GenericParameterClauseSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension GenericParameterClauseSyntax: @retroactive ExpressibleByStringInterpolation {}
extension GenericParameterClauseSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension MemberBlockSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension MemberBlockSyntax: @retroactive ExpressibleByStringInterpolation {}
extension MemberBlockSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension PatternSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension PatternSyntax: @retroactive ExpressibleByStringInterpolation {}
extension PatternSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension SourceFileSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension SourceFileSyntax: @retroactive ExpressibleByStringInterpolation {}
extension SourceFileSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension StmtSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension StmtSyntax: @retroactive ExpressibleByStringInterpolation {}
extension StmtSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension SwitchCaseSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension SwitchCaseSyntax: @retroactive ExpressibleByStringInterpolation {}
extension SwitchCaseSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension TypeSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension TypeSyntax: @retroactive ExpressibleByStringInterpolation {}
extension TypeSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension VersionTupleSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension VersionTupleSyntax: @retroactive ExpressibleByStringInterpolation {}
extension VersionTupleSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension AccessorDeclListSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension AccessorDeclListSyntax: @retroactive ExpressibleByStringInterpolation {}
extension AccessorDeclListSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension AttributeListSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension AttributeListSyntax: @retroactive ExpressibleByStringInterpolation {}
extension AttributeListSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension CodeBlockItemListSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension CodeBlockItemListSyntax: @retroactive ExpressibleByStringInterpolation {}
extension CodeBlockItemListSyntax: Swift.ExpressibleByStringInterpolation {}
#endif

extension MemberBlockItemListSyntax: SyntaxExpressibleByStringInterpolation {}

#if compiler(>=6)
extension MemberBlockItemListSyntax: @retroactive ExpressibleByStringInterpolation {}
extension MemberBlockItemListSyntax: Swift.ExpressibleByStringInterpolation {}
#endif