averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename startswith to starts_with

Browse Source 
LLVM is presumably moving towards `std::string_view` -
`StringRef::startswith` is deprecated on tip. `SmallString::startswith`
was just renamed there (maybe with some small deprecation inbetween, but
if so, we've missed it).

The `SmallString::startswith` references were moved to
`.str().starts_with()`, rather than adding the `starts_with` on
`stable/20230725` as we only had a few of them. Open to switching that
over if anyone feels strongly though.
This commit is contained in:
Ben Barham
2024-03-13 22:25:47 -07:00
parent 495a17743a
commit 9779c18da3
113 changed files with 276 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/ModuleInterfaceBuilder.cpp
View File

@@ -47,7 +47,7 @@ namespace path = llvm::sys::path;
static std::optional<StringRef> getRelativeDepPath(StringRef DepPath,
StringRef Base) {
// If Base is the root directory, or DepPath does not start with Base, bail.
if (Base.size() <= 1 || !DepPath.startswith(Base)) {
if (Base.size() <= 1 || !DepPath.starts_with(Base)) {
return std::nullopt;
}
@@ -123,7 +123,7 @@ bool ExplicitModuleInterfaceBuilder::collectDepsForSerialization(
path::native(InitialDepName, Scratch);
StringRef DepName = Scratch.str();
assert(moduleCachePath.empty() || !DepName.startswith(moduleCachePath));
assert(moduleCachePath.empty() || !DepName.starts_with(moduleCachePath));
// Serialize the paths of dependencies in the SDK relative to it.
std::optional<StringRef> SDKRelativePath =
@@ -133,19 +133,19 @@ bool ExplicitModuleInterfaceBuilder::collectDepsForSerialization(
// Forwarding modules add the underlying prebuilt module to their
// dependency list -- don't serialize that.
if (!prebuiltCachePath.empty() && DepName.startswith(prebuiltCachePath))
if (!prebuiltCachePath.empty() && DepName.starts_with(prebuiltCachePath))
continue;
// Don't serialize interface path if it's from the preferred interface dir.
// This ensures the prebuilt module caches generated from these interfaces
// are relocatable.
if (!backupInterfaceDir.empty() && DepName.startswith(backupInterfaceDir))
if (!backupInterfaceDir.empty() && DepName.starts_with(backupInterfaceDir))
continue;
if (dependencyTracker) {
dependencyTracker->addDependency(DepName, /*isSystem*/ IsSDKRelative);
}
// Don't serialize compiler-relative deps so the cache is relocatable.
if (DepName.startswith(ResourcePath))
if (DepName.starts_with(ResourcePath))
continue;
auto Status = fs.status(DepName);