[clang-tools-extra] 86029e4 - [clang-tools-extra] Rename StringRef _lower() method calls to _insensitive()
Martin Storsjö via cfe-commits
cfe-commits at lists.llvm.org
Thu Jun 24 14:23:33 PDT 2021
Author: Martin Storsjö
Date: 2021-06-25T00:22:01+03:00
New Revision: 86029e4c220b91be728f6ff6a17cad098821e657
URL: https://github.com/llvm/llvm-project/commit/86029e4c220b91be728f6ff6a17cad098821e657
DIFF: https://github.com/llvm/llvm-project/commit/86029e4c220b91be728f6ff6a17cad098821e657.diff
LOG: [clang-tools-extra] Rename StringRef _lower() method calls to _insensitive()
Added:
Modified:
clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp
clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
clang-tools-extra/clangd/CodeComplete.cpp
clang-tools-extra/clangd/CompileCommands.cpp
clang-tools-extra/clangd/ConfigYAML.cpp
clang-tools-extra/clangd/HeaderSourceSwitch.cpp
clang-tools-extra/clangd/InlayHints.cpp
clang-tools-extra/clangd/Quality.cpp
clang-tools-extra/clangd/index/SymbolCollector.cpp
clang-tools-extra/clangd/support/Path.cpp
clang-tools-extra/modularize/ModularizeUtilities.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
index 6f7f6611c8d20..f447ee41f6f8f 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
@@ -150,11 +150,11 @@ llvm::Optional<int64_t> ClangTidyCheck::OptionsView::getEnumInt(
unsigned EditDistance = 3;
for (const auto &NameAndEnum : Mapping) {
if (IgnoreCase) {
- if (Value.equals_lower(NameAndEnum.second))
+ if (Value.equals_insensitive(NameAndEnum.second))
return NameAndEnum.first;
} else if (Value.equals(NameAndEnum.second)) {
return NameAndEnum.first;
- } else if (Value.equals_lower(NameAndEnum.second)) {
+ } else if (Value.equals_insensitive(NameAndEnum.second)) {
Closest = NameAndEnum.second;
EditDistance = 0;
continue;
diff --git a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
index f7c71cca71594..769494207aef2 100644
--- a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
@@ -70,9 +70,9 @@ void KernelNameRestrictionPPCallbacks::InclusionDirective(
bool KernelNameRestrictionPPCallbacks::fileNameIsRestricted(
StringRef FileName) {
- return FileName.equals_lower("kernel.cl") ||
- FileName.equals_lower("verilog.cl") ||
- FileName.equals_lower("vhdl.cl");
+ return FileName.equals_insensitive("kernel.cl") ||
+ FileName.equals_insensitive("verilog.cl") ||
+ FileName.equals_insensitive("vhdl.cl");
}
void KernelNameRestrictionPPCallbacks::EndOfMainFile() {
diff --git a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp
index 32af0ee6266d2..e50ebdba3b343 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp
@@ -176,8 +176,8 @@ static bool sameName(StringRef InComment, StringRef InDecl, bool StrictMode) {
return InComment == InDecl;
InComment = InComment.trim('_');
InDecl = InDecl.trim('_');
- // FIXME: compare_lower only works for ASCII.
- return InComment.compare_lower(InDecl) == 0;
+ // FIXME: compare_insensitive only works for ASCII.
+ return InComment.compare_insensitive(InDecl) == 0;
}
static bool looksLikeExpectMethod(const CXXMethodDecl *Expect) {
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
index 6f056e73ad5d6..9ff94a009d0dd 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
@@ -159,7 +159,7 @@ void PreferMemberInitializerCheck::check(
if (S->getBeginLoc().isMacroID()) {
StringRef MacroName = Lexer::getImmediateMacroName(
S->getBeginLoc(), *Result.SourceManager, getLangOpts());
- if (MacroName.contains_lower("assert"))
+ if (MacroName.contains_insensitive("assert"))
return;
}
if (isControlStatement(S))
diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
index 224936887e033..93df4915e9f74 100644
--- a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
@@ -104,8 +104,8 @@ void StaticAssertCheck::check(const MatchFinder::MatchResult &Result) {
StringRef FalseMacroName =
Lexer::getImmediateMacroName(FalseLiteralLoc, SM, Opts);
- if (FalseMacroName.compare_lower("false") == 0 ||
- FalseMacroName.compare_lower("null") == 0)
+ if (FalseMacroName.compare_insensitive("false") == 0 ||
+ FalseMacroName.compare_insensitive("null") == 0)
return;
}
diff --git a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
index b3945b5a932f5..9d467e54a98d8 100644
--- a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
@@ -93,8 +93,8 @@ bool nameMatch(StringRef L, StringRef R, bool Strict) {
return L.empty() || R.empty() || L == R;
// We allow two names if one is a prefix/suffix of the other, ignoring case.
// Important special case: this is true if either parameter has no name!
- return L.startswith_lower(R) || R.startswith_lower(L) ||
- L.endswith_lower(R) || R.endswith_lower(L);
+ return L.startswith_insensitive(R) || R.startswith_insensitive(L) ||
+ L.endswith_insensitive(R) || R.endswith_insensitive(L);
}
DifferingParamsContainer
diff --git a/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp b/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
index 827711e92e877..6abb5c3b877d6 100644
--- a/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
@@ -93,7 +93,7 @@ getNewSuffix(llvm::StringRef OldSuffix,
// Else, find matching suffix, case-*insensitive*ly.
auto NewSuffix = llvm::find_if(
NewSuffixes, [OldSuffix](const std::string &PotentialNewSuffix) {
- return OldSuffix.equals_lower(PotentialNewSuffix);
+ return OldSuffix.equals_insensitive(PotentialNewSuffix);
});
// Have a match, return it.
if (NewSuffix != NewSuffixes.end())
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp
index 2eff1c61fa3b3..b36cfd4ba00cf 100644
--- a/clang-tools-extra/clangd/CodeComplete.cpp
+++ b/clang-tools-extra/clangd/CodeComplete.cpp
@@ -1680,7 +1680,7 @@ class CodeCompleteFlow {
C.SemaResult->Kind == CodeCompletionResult::RK_Macro) ||
(C.IndexResult &&
C.IndexResult->SymInfo.Kind == index::SymbolKind::Macro)) &&
- !C.Name.startswith_lower(Filter->pattern()))
+ !C.Name.startswith_insensitive(Filter->pattern()))
return None;
return Filter->match(C.Name);
}
diff --git a/clang-tools-extra/clangd/CompileCommands.cpp b/clang-tools-extra/clangd/CompileCommands.cpp
index 633d13b8b9f0d..e749720b83a13 100644
--- a/clang-tools-extra/clangd/CompileCommands.cpp
+++ b/clang-tools-extra/clangd/CompileCommands.cpp
@@ -296,9 +296,9 @@ enum DriverMode : unsigned char {
DriverMode getDriverMode(const std::vector<std::string> &Args) {
DriverMode Mode = DM_GCC;
llvm::StringRef Argv0 = Args.front();
- if (Argv0.endswith_lower(".exe"))
+ if (Argv0.endswith_insensitive(".exe"))
Argv0 = Argv0.drop_back(strlen(".exe"));
- if (Argv0.endswith_lower("cl"))
+ if (Argv0.endswith_insensitive("cl"))
Mode = DM_CL;
for (const llvm::StringRef Arg : Args) {
if (Arg == "--driver-mode=cl") {
diff --git a/clang-tools-extra/clangd/ConfigYAML.cpp b/clang-tools-extra/clangd/ConfigYAML.cpp
index f5739de0092d9..8a493346d2ce9 100644
--- a/clang-tools-extra/clangd/ConfigYAML.cpp
+++ b/clang-tools-extra/clangd/ConfigYAML.cpp
@@ -169,7 +169,7 @@ class Parser {
void parse(Fragment::IndexBlock::ExternalBlock &F,
Located<std::string> ExternalVal) {
- if (!llvm::StringRef(*ExternalVal).equals_lower("none")) {
+ if (!llvm::StringRef(*ExternalVal).equals_insensitive("none")) {
error("Only scalar value supported for External is 'None'",
ExternalVal.Range);
return;
diff --git a/clang-tools-extra/clangd/HeaderSourceSwitch.cpp b/clang-tools-extra/clangd/HeaderSourceSwitch.cpp
index cd493a72b2427..e3e2ab3ea8694 100644
--- a/clang-tools-extra/clangd/HeaderSourceSwitch.cpp
+++ b/clang-tools-extra/clangd/HeaderSourceSwitch.cpp
@@ -27,13 +27,13 @@ llvm::Optional<Path> getCorrespondingHeaderOrSource(
// Lookup in a list of known extensions.
auto SourceIter =
llvm::find_if(SourceExtensions, [&PathExt](PathRef SourceExt) {
- return SourceExt.equals_lower(PathExt);
+ return SourceExt.equals_insensitive(PathExt);
});
bool IsSource = SourceIter != std::end(SourceExtensions);
auto HeaderIter =
llvm::find_if(HeaderExtensions, [&PathExt](PathRef HeaderExt) {
- return HeaderExt.equals_lower(PathExt);
+ return HeaderExt.equals_insensitive(PathExt);
});
bool IsHeader = HeaderIter != std::end(HeaderExtensions);
diff --git a/clang-tools-extra/clangd/InlayHints.cpp b/clang-tools-extra/clangd/InlayHints.cpp
index 1002aee218477..c1a8357201e9c 100644
--- a/clang-tools-extra/clangd/InlayHints.cpp
+++ b/clang-tools-extra/clangd/InlayHints.cpp
@@ -156,7 +156,7 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
return false;
StringRef Name = getSimpleName(*Callee);
- if (!Name.startswith_lower("set"))
+ if (!Name.startswith_insensitive("set"))
return false;
// In addition to checking that the function has one parameter and its
@@ -168,10 +168,10 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
// This currently doesn't handle cases where params use snake_case
// and functions don't, e.g.
// void setExceptionHandler(EHFunc exception_handler);
- // We could improve this by replacing `equals_lower` with some
+ // We could improve this by replacing `equals_insensitive` with some
// `sloppy_equals` which ignores case and also skips underscores.
StringRef WhatItIsSetting = Name.substr(3).ltrim("_");
- return WhatItIsSetting.equals_lower(ParamNames[0]);
+ return WhatItIsSetting.equals_insensitive(ParamNames[0]);
}
bool shouldHint(const Expr *Arg, StringRef ParamName) {
diff --git a/clang-tools-extra/clangd/Quality.cpp b/clang-tools-extra/clangd/Quality.cpp
index 99421009c71ca..dc9c75b576708 100644
--- a/clang-tools-extra/clangd/Quality.cpp
+++ b/clang-tools-extra/clangd/Quality.cpp
@@ -378,7 +378,7 @@ static llvm::Optional<llvm::StringRef>
wordMatching(llvm::StringRef Name, const llvm::StringSet<> *ContextWords) {
if (ContextWords)
for (const auto &Word : ContextWords->keys())
- if (Name.contains_lower(Word))
+ if (Name.contains_insensitive(Word))
return Word;
return llvm::None;
}
@@ -552,7 +552,7 @@ evaluateDecisionForest(const SymbolQualitySignals &Quality,
int NumMatch = 0;
if (Relevance.ContextWords) {
for (const auto &Word : Relevance.ContextWords->keys()) {
- if (Relevance.Name.contains_lower(Word)) {
+ if (Relevance.Name.contains_insensitive(Word)) {
++NumMatch;
}
}
diff --git a/clang-tools-extra/clangd/index/SymbolCollector.cpp b/clang-tools-extra/clangd/index/SymbolCollector.cpp
index 84d0ca9bbbd16..9211dd3eb48a5 100644
--- a/clang-tools-extra/clangd/index/SymbolCollector.cpp
+++ b/clang-tools-extra/clangd/index/SymbolCollector.cpp
@@ -285,7 +285,8 @@ class SymbolCollector::HeaderFileURICache {
Line = Line.ltrim();
if (!Line.startswith("error"))
return false;
- return Line.contains_lower("includ"); // Matches "include" or "including".
+ return Line.contains_insensitive(
+ "includ"); // Matches "include" or "including".
}
// Heuristically headers that only want to be included via an umbrella.
diff --git a/clang-tools-extra/clangd/support/Path.cpp b/clang-tools-extra/clangd/support/Path.cpp
index 44302c808502b..1dd107cc6abef 100644
--- a/clang-tools-extra/clangd/support/Path.cpp
+++ b/clang-tools-extra/clangd/support/Path.cpp
@@ -13,7 +13,7 @@ namespace clangd {
#ifdef CLANGD_PATH_CASE_INSENSITIVE
std::string maybeCaseFoldPath(PathRef Path) { return Path.lower(); }
-bool pathEqual(PathRef A, PathRef B) { return A.equals_lower(B); }
+bool pathEqual(PathRef A, PathRef B) { return A.equals_insensitive(B); }
#else // NOT CLANGD_PATH_CASE_INSENSITIVE
std::string maybeCaseFoldPath(PathRef Path) { return Path.str(); }
bool pathEqual(PathRef A, PathRef B) { return A == B; }
diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp
index 200370c135dfa..3bf761c0a22c3 100644
--- a/clang-tools-extra/modularize/ModularizeUtilities.cpp
+++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp
@@ -470,9 +470,9 @@ bool ModularizeUtilities::isHeader(StringRef FileName) {
StringRef Extension = llvm::sys::path::extension(FileName);
if (Extension.size() == 0)
return true;
- if (Extension.equals_lower(".h"))
+ if (Extension.equals_insensitive(".h"))
return true;
- if (Extension.equals_lower(".inc"))
+ if (Extension.equals_insensitive(".inc"))
return true;
return false;
}
More information about the cfe-commits
mailing list