Skip to content

Fix warnings #85144

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 4 commits into from
Oct 27, 2025
Merged

Fix warnings #85144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2eca462
ASTGen: Remove an unnecessary try.
tshortli Oct 26, 2025
bf9598a
ASTGen: Fix an implicit pointer conversion warning.
tshortli Oct 26, 2025
80a292b
ASTGen: Work around a retroactive conformance bug in Swift 6.2.
tshortli Oct 26, 2025
8cf7582
Swiftify: Fix an unused variable warning.
tshortli Oct 26, 2025
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
6 changes: 5 additions & 1 deletion lib/ASTGen/Sources/ASTGen/Bridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ public func freeBridgedString(bridged: BridgedStringRef) {
bridged.data?.deallocate()
}

extension BridgedStringRef: /*@retroactive*/ Swift.ExpressibleByStringLiteral {
extension BridgedStringRef:
/*@retroactive*/ Swift.ExpressibleByStringLiteral,
Swift.ExpressibleByExtendedGraphemeClusterLiteral,
Swift.ExpressibleByUnicodeScalarLiteral
{
public init(stringLiteral str: StaticString) {
self.init(data: str.utf8Start, count: str.utf8CodeUnitCount)
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ASTGen/Sources/ASTGen/CompilerBuildConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ struct CompilerBuildConfiguration: BuildConfiguration {
}

func isActiveTargetObjectFormat(name: String) throws -> Bool {
try staticBuildConfiguration.isActiveTargetObjectFormat(name: name)
staticBuildConfiguration.isActiveTargetObjectFormat(name: name)
}

var targetAtomicBitWidths: [Int] {
Expand Down
44 changes: 23 additions & 21 deletions lib/ASTGen/Sources/BasicSwift/StaticBuildConfiguration+LangOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,29 @@ extension StaticBuildConfiguration {
init(langOptions: BridgedLangOptions) {
var entries = ConfigurationEntries()

langOptions.enumerateBuildConfigurationEntries(callbackContext: &entries) { cContext, entries, key, value in
let entries = entries.assumingMemoryBound(to: ConfigurationEntries.self)
switch key {
case .BCKAttribute:
entries.pointee.attributes.insert(String(bridged: value))
case .BCKCustomCondition:
entries.pointee.customConditions.insert(String(bridged: value))
case .BCKFeature:
entries.pointee.features.insert(String(bridged: value))
case .BCKTargetOSName:
entries.pointee.targetOSNames.insert(String(bridged: value))
case .BCKTargetArchitecture:
entries.pointee.targetArchitectures.insert(String(bridged: value))
case .BCKTargetEnvironment:
entries.pointee.targetEnvironments.insert(String(bridged: value))
case .BCKTargetRuntime:
entries.pointee.targetRuntimes.insert(String(bridged: value))
case .BCKTargetPointerAuthenticationScheme:
entries.pointee.targetPointerAuthenticationSchemes.insert(String(bridged: value))
case .BCKTargetObjectFileFormat:
entries.pointee.targetObjectFileFormats.insert(String(bridged: value))
withUnsafeMutablePointer(to: &entries) {
langOptions.enumerateBuildConfigurationEntries(callbackContext: $0) { cContext, entries, key, value in
let entries = entries.assumingMemoryBound(to: ConfigurationEntries.self)
switch key {
case .BCKAttribute:
entries.pointee.attributes.insert(String(bridged: value))
case .BCKCustomCondition:
entries.pointee.customConditions.insert(String(bridged: value))
case .BCKFeature:
entries.pointee.features.insert(String(bridged: value))
case .BCKTargetOSName:
entries.pointee.targetOSNames.insert(String(bridged: value))
case .BCKTargetArchitecture:
entries.pointee.targetArchitectures.insert(String(bridged: value))
case .BCKTargetEnvironment:
entries.pointee.targetEnvironments.insert(String(bridged: value))
case .BCKTargetRuntime:
entries.pointee.targetRuntimes.insert(String(bridged: value))
case .BCKTargetPointerAuthenticationScheme:
entries.pointee.targetPointerAuthenticationSchemes.insert(String(bridged: value))
case .BCKTargetObjectFileFormat:
entries.pointee.targetObjectFileFormats.insert(String(bridged: value))
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Macros/Sources/SwiftMacros/SwiftifyImportMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,7 +1758,7 @@ func parseProtocolMacroParam(
if let methodSyntax = DeclSyntax("\(raw: methodSignature)").as(FunctionDeclSyntax.self) {
name = methodSyntax.name.trimmed.text
}
for (tmp, method) in methods where method.name.trimmed.text == name {
for (_, method) in methods where method.name.trimmed.text == name {
notes.append(Note(node: Syntax(method.name), message: MacroExpansionNoteMessage("did you mean '\(method.trimmed.description)'?")))
}
throw DiagnosticError(
Expand Down