[llvm] [llvm] Prefer StringRef::substr to StringRef::slice (NFC) (PR #106330)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 27 20:08:24 PDT 2024
https://github.com/kazutakahirata created https://github.com/llvm/llvm-project/pull/106330
S.substr(N) is simpler than S.slice(N, StringRef::npos). Also, substr
is probably better recognizable than slice thanks to
std::string_view::substr.
>From baf40b9813258b11ba91604b2d2f33190b57aa77 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Tue, 27 Aug 2024 19:48:14 -0700
Subject: [PATCH] [llvm] Prefer StringRef::substr to StringRef::slice (NFC)
S.substr(N) is simpler than S.slice(N, StringRef::npos). Also, substr
is probably better recognizable than slice thanks to
std::string_view::substr.
---
llvm/lib/FileCheck/FileCheck.cpp | 2 +-
llvm/tools/llvm-objcopy/ObjcopyOptions.cpp | 6 +++---
llvm/unittests/Support/VirtualFileSystemTest.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/llvm/lib/FileCheck/FileCheck.cpp b/llvm/lib/FileCheck/FileCheck.cpp
index df5f7f4697c5c4..b6c28385ebb097 100644
--- a/llvm/lib/FileCheck/FileCheck.cpp
+++ b/llvm/lib/FileCheck/FileCheck.cpp
@@ -298,7 +298,7 @@ Pattern::parseVariable(StringRef &Str, const SourceMgr &SM) {
++I;
if (I == Str.size())
- return ErrorDiagnostic::get(SM, Str.slice(I, StringRef::npos),
+ return ErrorDiagnostic::get(SM, Str.substr(I),
StringRef("empty ") +
(IsPseudo ? "pseudo " : "global ") +
"variable name");
diff --git a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
index d82ecc8b3d36ea..26a888c628d9d3 100644
--- a/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
+++ b/llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
@@ -556,9 +556,9 @@ static Expected<int64_t> parseChangeSectionLMA(StringRef ArgValue,
StringRef OptionName) {
StringRef StringValue;
if (ArgValue.starts_with("*+")) {
- StringValue = ArgValue.slice(2, StringRef::npos);
+ StringValue = ArgValue.substr(2);
} else if (ArgValue.starts_with("*-")) {
- StringValue = ArgValue.slice(1, StringRef::npos);
+ StringValue = ArgValue.substr(1);
} else if (ArgValue.contains("=")) {
return createStringError(errc::invalid_argument,
"bad format for " + OptionName +
@@ -608,7 +608,7 @@ parseChangeSectionAddr(StringRef ArgValue, StringRef OptionName,
SectionPattern, SectionMatchStyle, ErrorCallback)))
return std::move(E);
- StringRef Value = ArgValue.slice(LastSymbolIndex + 1, StringRef::npos);
+ StringRef Value = ArgValue.substr(LastSymbolIndex + 1);
if (Value.empty()) {
switch (UpdateSymbol) {
case '+':
diff --git a/llvm/unittests/Support/VirtualFileSystemTest.cpp b/llvm/unittests/Support/VirtualFileSystemTest.cpp
index d4717ce18eafc9..60649e94aeb5c0 100644
--- a/llvm/unittests/Support/VirtualFileSystemTest.cpp
+++ b/llvm/unittests/Support/VirtualFileSystemTest.cpp
@@ -1583,7 +1583,7 @@ class VFSFromYAMLTest : public ::testing::Test {
IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS = new DummyFileSystem(),
StringRef YAMLFilePath = "") {
std::string VersionPlusContent("{\n 'version':0,\n");
- VersionPlusContent += Content.slice(Content.find('{') + 1, StringRef::npos);
+ VersionPlusContent += Content.substr(Content.find('{') + 1);
return getFromYAMLRawString(VersionPlusContent, ExternalFS, YAMLFilePath);
}
More information about the llvm-commits
mailing list