Skip to content

Commit ab1fea4

Browse files
[clang-tools-extra] Use llvm::replace (NFC) (#140200)
1 parent e401fb8 commit ab1fea4

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

clang-tools-extra/clang-doc/HTMLGenerator.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1022,12 +1022,12 @@ static llvm::Error serializeIndex(ClangDocContext &CDCtx) {
10221022
// JavaScript from escaping characters incorrectly, and introducing bad paths
10231023
// in the URLs.
10241024
std::string RootPathEscaped = RootPath.str().str();
1025-
std::replace(RootPathEscaped.begin(), RootPathEscaped.end(), '\\', '/');
1025+
llvm::replace(RootPathEscaped, '\\', '/');
10261026
OS << "var RootPath = \"" << RootPathEscaped << "\";\n";
10271027

10281028
llvm::SmallString<128> Base(CDCtx.Base);
10291029
std::string BaseEscaped = Base.str().str();
1030-
std::replace(BaseEscaped.begin(), BaseEscaped.end(), '\\', '/');
1030+
llvm::replace(BaseEscaped, '\\', '/');
10311031
OS << "var Base = \"" << BaseEscaped << "\";\n";
10321032

10331033
CDCtx.Idx.sort();

clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ std::string LLVMHeaderGuardCheck::getHeaderGuard(StringRef Filename,
4949
if (PosLLVM != StringRef::npos)
5050
Guard = Guard.substr(PosLLVM);
5151

52-
std::replace(Guard.begin(), Guard.end(), '/', '_');
53-
std::replace(Guard.begin(), Guard.end(), '.', '_');
54-
std::replace(Guard.begin(), Guard.end(), '-', '_');
52+
llvm::replace(Guard, '/', '_');
53+
llvm::replace(Guard, '.', '_');
54+
llvm::replace(Guard, '-', '_');
5555

5656
// The prevalent style in clang is LLVM_CLANG_FOO_BAR_H
5757
if (StringRef(Guard).starts_with("clang"))

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ void IdentifierNamingCheck::HungarianNotation::loadFileConfig(
496496
StringRef Val = Options.get(Buffer, "");
497497
if (!Val.empty()) {
498498
std::string Type = PrimType.str();
499-
std::replace(Type.begin(), Type.end(), '-', ' ');
499+
llvm::replace(Type, '-', ' ');
500500
HNOption.PrimitiveType[Type] = Val.str();
501501
}
502502
}
@@ -1358,7 +1358,7 @@ IdentifierNamingCheck::getFailureInfo(
13581358
std::string KindName =
13591359
fixupWithCase(Type, StyleNames[SK], ND, Style, HNOption,
13601360
IdentifierNamingCheck::CT_LowerCase);
1361-
std::replace(KindName.begin(), KindName.end(), '_', ' ');
1361+
llvm::replace(KindName, '_', ' ');
13621362

13631363
std::string Fixup = fixupWithStyle(Type, Name, Style, HNOption, ND);
13641364
if (StringRef(Fixup) == Name) {

clang-tools-extra/clangd/Diagnostics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ void StoreDiags::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
800800
M << "'";
801801
}
802802
// Don't allow source code to inject newlines into diagnostics.
803-
std::replace(Message.begin(), Message.end(), '\n', ' ');
803+
llvm::replace(Message, '\n', ' ');
804804
}
805805
}
806806
if (Message.empty()) // either !SyntheticMessage, or we failed to make one.

clang-tools-extra/clangd/FindTarget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LLVM_ATTRIBUTE_UNUSED std::string nodeToString(const DynTypedNode &N) {
5757
OS << ": ";
5858
N.print(OS, PrintingPolicy(LangOptions()));
5959
}
60-
std::replace(S.begin(), S.end(), '\n', ' ');
60+
llvm::replace(S, '\n', ' ');
6161
return S;
6262
}
6363

clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ std::unique_ptr<SymbolIndex> openIndex(llvm::StringRef Index) {
381381

382382
bool runCommand(std::string Request, const SymbolIndex &Index) {
383383
// Split on spaces and add required null-termination.
384-
std::replace(Request.begin(), Request.end(), ' ', '\0');
384+
llvm::replace(Request, ' ', '\0');
385385
llvm::SmallVector<llvm::StringRef> Args;
386386
llvm::StringRef(Request).split(Args, '\0', /*MaxSplit=*/-1,
387387
/*KeepEmpty=*/false);

clang-tools-extra/modularize/ModularizeUtilities.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static std::string replaceDotDot(StringRef Path) {
443443
// \returns The file path in canonical form.
444444
std::string ModularizeUtilities::getCanonicalPath(StringRef FilePath) {
445445
std::string Tmp(replaceDotDot(FilePath));
446-
std::replace(Tmp.begin(), Tmp.end(), '\\', '/');
446+
llvm::replace(Tmp, '\\', '/');
447447
StringRef Tmp2(Tmp);
448448
if (Tmp2.starts_with("./"))
449449
Tmp = std::string(Tmp2.substr(2));

clang-tools-extra/modularize/ModuleAssistant.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ ensureNoCollisionWithReservedName(llvm::StringRef MightBeReservedName) {
156156
static std::string
157157
ensureVaidModuleName(llvm::StringRef MightBeInvalidName) {
158158
std::string SafeName(MightBeInvalidName);
159-
std::replace(SafeName.begin(), SafeName.end(), '-', '_');
160-
std::replace(SafeName.begin(), SafeName.end(), '.', '_');
159+
llvm::replace(SafeName, '-', '_');
160+
llvm::replace(SafeName, '.', '_');
161161
if (isdigit(SafeName[0]))
162162
SafeName = "_" + SafeName;
163163
return SafeName;
@@ -192,7 +192,7 @@ static bool addModuleDescription(Module *RootModule,
192192
return true;
193193
}
194194
// Make canonical.
195-
std::replace(FilePath.begin(), FilePath.end(), '\\', '/');
195+
llvm::replace(FilePath, '\\', '/');
196196
// Insert module into tree, using subdirectories as submodules.
197197
for (llvm::sys::path::const_iterator I = llvm::sys::path::begin(FilePath),
198198
E = llvm::sys::path::end(FilePath);

clang-tools-extra/modularize/PreprocessorTracker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ class PreprocessorTrackerImpl : public PreprocessorTracker {
904904
// Convert to a canonical path.
905905
std::string getCanonicalPath(llvm::StringRef path) const {
906906
std::string CanonicalPath(path);
907-
std::replace(CanonicalPath.begin(), CanonicalPath.end(), '\\', '/');
907+
llvm::replace(CanonicalPath, '\\', '/');
908908
return CanonicalPath;
909909
}
910910

clang-tools-extra/pp-trace/PPCallbacksTracker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static std::string getSourceLocationString(Preprocessor &PP,
4444
std::string Result = SS.str();
4545

4646
// YAML treats backslash as escape, so use forward slashes.
47-
std::replace(Result.begin(), Result.end(), '\\', '/');
47+
llvm::replace(Result, '\\', '/');
4848

4949
return Result;
5050
}
@@ -653,7 +653,7 @@ void PPCallbacksTracker::appendFilePathArgument(const char *Name,
653653
llvm::StringRef Value) {
654654
std::string Path(Value);
655655
// YAML treats backslash as escape, so use forward slashes.
656-
std::replace(Path.begin(), Path.end(), '\\', '/');
656+
llvm::replace(Path, '\\', '/');
657657
appendQuotedArgument(Name, Path);
658658
}
659659

0 commit comments

Comments
 (0)