Skip to content

Commit ed1539c

Browse files
Migrate {starts,ends}with_insensitive to {starts,ends}_with_insensitive (NFC)
This patch migrates uses of StringRef::{starts,ends}with_insensitive to StringRef::{starts,ends}_with_insensitive so that we can use names similar to those used in std::string_view. Note that the llvm/ directory has migrated in commit 6c3ea86. I'll post a separate patch to deprecate StringRef::{starts,ends}with_insensitive. Differential Revision: https://reviews.llvm.org/D150506
1 parent 4107898 commit ed1539c

File tree

24 files changed

+76
-76
lines changed

24 files changed

+76
-76
lines changed

clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ bool nameMatch(StringRef L, StringRef R, bool Strict) {
9191
return L.empty() || R.empty() || L == R;
9292
// We allow two names if one is a prefix/suffix of the other, ignoring case.
9393
// Important special case: this is true if either parameter has no name!
94-
return L.startswith_insensitive(R) || R.startswith_insensitive(L) ||
95-
L.endswith_insensitive(R) || R.endswith_insensitive(L);
94+
return L.starts_with_insensitive(R) || R.starts_with_insensitive(L) ||
95+
L.ends_with_insensitive(R) || R.ends_with_insensitive(L);
9696
}
9797

9898
DifferingParamsContainer

clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static bool applyPrefixHeuristic(StringRef Arg, StringRef Param,
154154
StringRef Shorter = Arg.size() < Param.size() ? Arg : Param;
155155
StringRef Longer = Arg.size() >= Param.size() ? Arg : Param;
156156

157-
if (Longer.startswith_insensitive(Shorter))
157+
if (Longer.starts_with_insensitive(Shorter))
158158
return percentage(Shorter.size(), Longer.size()) > Threshold;
159159

160160
return false;
@@ -166,7 +166,7 @@ static bool applySuffixHeuristic(StringRef Arg, StringRef Param,
166166
StringRef Shorter = Arg.size() < Param.size() ? Arg : Param;
167167
StringRef Longer = Arg.size() >= Param.size() ? Arg : Param;
168168

169-
if (Longer.endswith_insensitive(Shorter))
169+
if (Longer.ends_with_insensitive(Shorter))
170170
return percentage(Shorter.size(), Longer.size()) > Threshold;
171171

172172
return false;

clang-tools-extra/clangd/CodeComplete.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ class CodeCompleteFlow {
18841884
C.SemaResult->Kind == CodeCompletionResult::RK_Macro) ||
18851885
(C.IndexResult &&
18861886
C.IndexResult->SymInfo.Kind == index::SymbolKind::Macro)) &&
1887-
!C.Name.startswith_insensitive(Filter->pattern()))
1887+
!C.Name.starts_with_insensitive(Filter->pattern()))
18881888
return std::nullopt;
18891889
return Filter->match(C.Name);
18901890
}

clang-tools-extra/clangd/CompileCommands.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,9 @@ enum DriverMode : unsigned char {
422422
DriverMode getDriverMode(const std::vector<std::string> &Args) {
423423
DriverMode Mode = DM_GCC;
424424
llvm::StringRef Argv0 = Args.front();
425-
if (Argv0.endswith_insensitive(".exe"))
425+
if (Argv0.ends_with_insensitive(".exe"))
426426
Argv0 = Argv0.drop_back(strlen(".exe"));
427-
if (Argv0.endswith_insensitive("cl"))
427+
if (Argv0.ends_with_insensitive("cl"))
428428
Mode = DM_CL;
429429
for (const llvm::StringRef Arg : Args) {
430430
if (Arg == "--driver-mode=cl") {

clang-tools-extra/clangd/InlayHints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
430430
return false;
431431

432432
StringRef Name = getSimpleName(*Callee);
433-
if (!Name.startswith_insensitive("set"))
433+
if (!Name.starts_with_insensitive("set"))
434434
return false;
435435

436436
// In addition to checking that the function has one parameter and its

clang/lib/Analysis/RetainSummaryManager.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,18 @@ static bool hasRCAnnotation(const Decl *D, StringRef rcAnnotation) {
190190
}
191191

192192
static bool isRetain(const FunctionDecl *FD, StringRef FName) {
193-
return FName.startswith_insensitive("retain") ||
194-
FName.endswith_insensitive("retain");
193+
return FName.starts_with_insensitive("retain") ||
194+
FName.ends_with_insensitive("retain");
195195
}
196196

197197
static bool isRelease(const FunctionDecl *FD, StringRef FName) {
198-
return FName.startswith_insensitive("release") ||
199-
FName.endswith_insensitive("release");
198+
return FName.starts_with_insensitive("release") ||
199+
FName.ends_with_insensitive("release");
200200
}
201201

202202
static bool isAutorelease(const FunctionDecl *FD, StringRef FName) {
203-
return FName.startswith_insensitive("autorelease") ||
204-
FName.endswith_insensitive("autorelease");
203+
return FName.starts_with_insensitive("autorelease") ||
204+
FName.ends_with_insensitive("autorelease");
205205
}
206206

207207
static bool isMakeCollectable(StringRef FName) {

clang/lib/CodeGen/TargetInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ static std::string qualifyWindowsLibrary(llvm::StringRef Lib) {
26722672
bool Quote = Lib.contains(' ');
26732673
std::string ArgStr = Quote ? "\"" : "";
26742674
ArgStr += Lib;
2675-
if (!Lib.endswith_insensitive(".lib") && !Lib.endswith_insensitive(".a"))
2675+
if (!Lib.ends_with_insensitive(".lib") && !Lib.ends_with_insensitive(".a"))
26762676
ArgStr += ".lib";
26772677
ArgStr += Quote ? "\"" : "";
26782678
return ArgStr;

clang/lib/Driver/Driver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,9 +693,9 @@ static llvm::Triple computeTargetTriple(const Driver &D,
693693
if (Args.hasArg(options::OPT_march_EQ) ||
694694
Args.hasArg(options::OPT_mcpu_EQ)) {
695695
StringRef ArchName = tools::riscv::getRISCVArch(Args, Target);
696-
if (ArchName.startswith_insensitive("rv32"))
696+
if (ArchName.starts_with_insensitive("rv32"))
697697
Target.setArch(llvm::Triple::riscv32);
698-
else if (ArchName.startswith_insensitive("rv64"))
698+
else if (ArchName.starts_with_insensitive("rv64"))
699699
Target.setArch(llvm::Triple::riscv64);
700700
}
701701
}
@@ -6167,7 +6167,7 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
61676167
case llvm::Triple::MSVC:
61686168
case llvm::Triple::UnknownEnvironment:
61696169
if (Args.getLastArgValue(options::OPT_fuse_ld_EQ)
6170-
.startswith_insensitive("bfd"))
6170+
.starts_with_insensitive("bfd"))
61716171
TC = std::make_unique<toolchains::CrossWindowsToolChain>(
61726172
*this, Target, Args);
61736173
else

clang/lib/Driver/OffloadBundler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ bool OffloadTargetInfo::isOffloadKindCompatible(
106106
if (OffloadKind == TargetOffloadKind)
107107
return true;
108108
if (BundlerConfig.HipOpenmpCompatible) {
109-
bool HIPCompatibleWithOpenMP = OffloadKind.startswith_insensitive("hip") &&
109+
bool HIPCompatibleWithOpenMP = OffloadKind.starts_with_insensitive("hip") &&
110110
TargetOffloadKind == "openmp";
111111
bool OpenMPCompatibleWithHIP =
112112
OffloadKind == "openmp" &&
113-
TargetOffloadKind.startswith_insensitive("hip");
113+
TargetOffloadKind.starts_with_insensitive("hip");
114114
return HIPCompatibleWithOpenMP || OpenMPCompatibleWithHIP;
115115
}
116116
return false;

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ StringRef riscv::getRISCVArch(const llvm::opt::ArgList &Args,
290290

291291
if (MABI.equals_insensitive("ilp32e"))
292292
return "rv32e";
293-
else if (MABI.startswith_insensitive("ilp32"))
293+
else if (MABI.starts_with_insensitive("ilp32"))
294294
return "rv32imafdc";
295-
else if (MABI.startswith_insensitive("lp64"))
295+
else if (MABI.starts_with_insensitive("lp64"))
296296
return "rv64imafdc";
297297
}
298298

0 commit comments

Comments
 (0)