Skip to content

Make the Runfiles compatible with Swift 6 language mode #1617

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −16
Open

Make the Runfiles compatible with Swift 6 language mode #1617

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35f4dfb
[Runfiles] reindent
kirillyakimovich Nov 18, 2025
81e3896
Make the Runfiles compatible with Swift 6 language mode
kirillyakimovich Nov 18, 2025
d5185bc
Swiftify
kirillyakimovich Nov 18, 2025
3783086
Merge branch 'main' into ky/make-regexps-nonisolated
aaronsky Nov 22, 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
31 changes: 15 additions & 16 deletions swift/runfiles/Runfiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,22 +214,21 @@ public final class Runfiles {
}
}

// https://github.com/bazel-contrib/rules_go/blob/6505cf2e4f0a768497b123a74363f47b711e1d02/go/runfiles/global.go#L53-L54
private let legacyExternalGeneratedFile = /bazel-out\/[^\/]+\/bin\/external\/([^\/]+)/
private let legacyExternalFile = /external\/([^\/]+)/

// Extracts the canonical name of the repository containing the file
// located at `path`.
private func repository(from path: String) -> String {
if let match = path.prefixMatch(of: legacyExternalGeneratedFile) {
return String(match.1)
}
if let match = path.prefixMatch(of: legacyExternalFile) {
return String(match.1)
}
// If a file is not in an external repository, return an empty string
return ""
}
// https://github.com/bazel-contrib/rules_go/blob/6505cf2e4f0a768497b123a74363f47b711e1d02/go/runfiles/global.go#L53-L54
#if swift(>=5.10)
nonisolated(unsafe) private let legacyExternalGeneratedFile = /bazel-out\/[^\/]+\/bin\/external\/([^\/]+)/
nonisolated(unsafe) private let legacyExternalFile = /external\/([^\/]+)/
#else
private let legacyExternalGeneratedFile = /bazel-out\/[^\/]+\/bin\/external\/([^\/]+)/
private let legacyExternalFile = /external\/([^\/]+)/
#endif

// Extracts the canonical name of the repository containing the file
// located at `path`.
private func repository(from path: String) -> String {
let match = path.prefixMatch(of: legacyExternalGeneratedFile) ?? path.prefixMatch(of: legacyExternalFile)
return match.map { String($0.1) } ?? ""
}

// MARK: Runfiles Paths Computation

Expand Down