[clang-tools-extra] Use llvm::replace (NFC) (#140200)
diff --git a/clang-tools-extra/clang-doc/HTMLGenerator.cpp b/clang-tools-extra/clang-doc/HTMLGenerator.cpp
index 4ad5ba2..eea9c6b 100644
--- a/clang-tools-extra/clang-doc/HTMLGenerator.cpp
+++ b/clang-tools-extra/clang-doc/HTMLGenerator.cpp
@@ -1022,12 +1022,12 @@
// JavaScript from escaping characters incorrectly, and introducing bad paths
// in the URLs.
std::string RootPathEscaped = RootPath.str().str();
- std::replace(RootPathEscaped.begin(), RootPathEscaped.end(), '\\', '/');
+ llvm::replace(RootPathEscaped, '\\', '/');
OS << "var RootPath = \"" << RootPathEscaped << "\";\n";
llvm::SmallString<128> Base(CDCtx.Base);
std::string BaseEscaped = Base.str().str();
- std::replace(BaseEscaped.begin(), BaseEscaped.end(), '\\', '/');
+ llvm::replace(BaseEscaped, '\\', '/');
OS << "var Base = \"" << BaseEscaped << "\";\n";
CDCtx.Idx.sort();
diff --git a/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp b/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp
index 42d358a..ba89070 100644
--- a/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp
@@ -49,9 +49,9 @@
if (PosLLVM != StringRef::npos)
Guard = Guard.substr(PosLLVM);
- std::replace(Guard.begin(), Guard.end(), '/', '_');
- std::replace(Guard.begin(), Guard.end(), '.', '_');
- std::replace(Guard.begin(), Guard.end(), '-', '_');
+ llvm::replace(Guard, '/', '_');
+ llvm::replace(Guard, '.', '_');
+ llvm::replace(Guard, '-', '_');
// The prevalent style in clang is LLVM_CLANG_FOO_BAR_H
if (StringRef(Guard).starts_with("clang"))
diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
index 3f63eec..04040d5 100644
--- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
@@ -496,7 +496,7 @@
StringRef Val = Options.get(Buffer, "");
if (!Val.empty()) {
std::string Type = PrimType.str();
- std::replace(Type.begin(), Type.end(), '-', ' ');
+ llvm::replace(Type, '-', ' ');
HNOption.PrimitiveType[Type] = Val.str();
}
}
@@ -1358,7 +1358,7 @@
std::string KindName =
fixupWithCase(Type, StyleNames[SK], ND, Style, HNOption,
IdentifierNamingCheck::CT_LowerCase);
- std::replace(KindName.begin(), KindName.end(), '_', ' ');
+ llvm::replace(KindName, '_', ' ');
std::string Fixup = fixupWithStyle(Type, Name, Style, HNOption, ND);
if (StringRef(Fixup) == Name) {
diff --git a/clang-tools-extra/clangd/Diagnostics.cpp b/clang-tools-extra/clangd/Diagnostics.cpp
index 28bb994..bc605fd 100644
--- a/clang-tools-extra/clangd/Diagnostics.cpp
+++ b/clang-tools-extra/clangd/Diagnostics.cpp
@@ -800,7 +800,7 @@
M << "'";
}
// Don't allow source code to inject newlines into diagnostics.
- std::replace(Message.begin(), Message.end(), '\n', ' ');
+ llvm::replace(Message, '\n', ' ');
}
}
if (Message.empty()) // either !SyntheticMessage, or we failed to make one.
diff --git a/clang-tools-extra/clangd/FindTarget.cpp b/clang-tools-extra/clangd/FindTarget.cpp
index 62f220b..91fd3b0 100644
--- a/clang-tools-extra/clangd/FindTarget.cpp
+++ b/clang-tools-extra/clangd/FindTarget.cpp
@@ -57,7 +57,7 @@
OS << ": ";
N.print(OS, PrintingPolicy(LangOptions()));
}
- std::replace(S.begin(), S.end(), '\n', ' ');
+ llvm::replace(S, '\n', ' ');
return S;
}
diff --git a/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp b/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp
index d192749..fa451da 100644
--- a/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp
+++ b/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp
@@ -381,7 +381,7 @@
bool runCommand(std::string Request, const SymbolIndex &Index) {
// Split on spaces and add required null-termination.
- std::replace(Request.begin(), Request.end(), ' ', '\0');
+ llvm::replace(Request, ' ', '\0');
llvm::SmallVector<llvm::StringRef> Args;
llvm::StringRef(Request).split(Args, '\0', /*MaxSplit=*/-1,
/*KeepEmpty=*/false);
diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp
index 576e863..a8f1ddf 100644
--- a/clang-tools-extra/modularize/ModularizeUtilities.cpp
+++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp
@@ -443,7 +443,7 @@
// \returns The file path in canonical form.
std::string ModularizeUtilities::getCanonicalPath(StringRef FilePath) {
std::string Tmp(replaceDotDot(FilePath));
- std::replace(Tmp.begin(), Tmp.end(), '\\', '/');
+ llvm::replace(Tmp, '\\', '/');
StringRef Tmp2(Tmp);
if (Tmp2.starts_with("./"))
Tmp = std::string(Tmp2.substr(2));
diff --git a/clang-tools-extra/modularize/ModuleAssistant.cpp b/clang-tools-extra/modularize/ModuleAssistant.cpp
index b4ec966..7519056 100644
--- a/clang-tools-extra/modularize/ModuleAssistant.cpp
+++ b/clang-tools-extra/modularize/ModuleAssistant.cpp
@@ -156,8 +156,8 @@
static std::string
ensureVaidModuleName(llvm::StringRef MightBeInvalidName) {
std::string SafeName(MightBeInvalidName);
- std::replace(SafeName.begin(), SafeName.end(), '-', '_');
- std::replace(SafeName.begin(), SafeName.end(), '.', '_');
+ llvm::replace(SafeName, '-', '_');
+ llvm::replace(SafeName, '.', '_');
if (isdigit(SafeName[0]))
SafeName = "_" + SafeName;
return SafeName;
@@ -192,7 +192,7 @@
return true;
}
// Make canonical.
- std::replace(FilePath.begin(), FilePath.end(), '\\', '/');
+ llvm::replace(FilePath, '\\', '/');
// Insert module into tree, using subdirectories as submodules.
for (llvm::sys::path::const_iterator I = llvm::sys::path::begin(FilePath),
E = llvm::sys::path::end(FilePath);
diff --git a/clang-tools-extra/modularize/PreprocessorTracker.cpp b/clang-tools-extra/modularize/PreprocessorTracker.cpp
index 336f570..04abb27 100644
--- a/clang-tools-extra/modularize/PreprocessorTracker.cpp
+++ b/clang-tools-extra/modularize/PreprocessorTracker.cpp
@@ -904,7 +904,7 @@
// Convert to a canonical path.
std::string getCanonicalPath(llvm::StringRef path) const {
std::string CanonicalPath(path);
- std::replace(CanonicalPath.begin(), CanonicalPath.end(), '\\', '/');
+ llvm::replace(CanonicalPath, '\\', '/');
return CanonicalPath;
}
diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
index 4c916fa..f92e406 100644
--- a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
+++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
@@ -44,7 +44,7 @@
std::string Result = SS.str();
// YAML treats backslash as escape, so use forward slashes.
- std::replace(Result.begin(), Result.end(), '\\', '/');
+ llvm::replace(Result, '\\', '/');
return Result;
}
@@ -653,7 +653,7 @@
llvm::StringRef Value) {
std::string Path(Value);
// YAML treats backslash as escape, so use forward slashes.
- std::replace(Path.begin(), Path.end(), '\\', '/');
+ llvm::replace(Path, '\\', '/');
appendQuotedArgument(Name, Path);
}
