[mlir] Prefer StringRef::substr to slice (NFC) #113788
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I'm planning to migrate StringRef to std::string_view eventually. Since std::string_view does not have slice, this patch migrates: slice(0, N) to substr(0, N) slice(N, StringRef::npos) to substr(N)
|
@llvm/pr-subscribers-mlir Author: Kazu Hirata (kazutakahirata) ChangesI'm planning to migrate StringRef to std::string_view slice(0, N) to substr(0, N) Full diff: https://github.com/llvm/llvm-project/pull/113788.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Support/IndentedOstream.h b/mlir/include/mlir/Support/IndentedOstream.h
index 101aa8b631d299..eeab36806c4ee7 100644
--- a/mlir/include/mlir/Support/IndentedOstream.h
+++ b/mlir/include/mlir/Support/IndentedOstream.h
@@ -166,8 +166,7 @@ inline void mlir::raw_indented_ostream::write_impl(const char *ptr,
break;
}
- auto split =
- std::make_pair(str.slice(0, idx), str.slice(idx + 1, StringRef::npos));
+ auto split = std::make_pair(str.substr(0, idx), str.substr(idx + 1));
// Print empty new line without spaces if line only has spaces and no extra
// prefix is requested.
if (!split.first.ltrim().empty() || !currentExtraPrefix.empty())
diff --git a/mlir/lib/Query/QueryParser.cpp b/mlir/lib/Query/QueryParser.cpp
index 13ee931cc5227f..31aead7d403d0d 100644
--- a/mlir/lib/Query/QueryParser.cpp
+++ b/mlir/lib/Query/QueryParser.cpp
@@ -181,8 +181,8 @@ QueryRef QueryParser::doParse() {
if (!matcher) {
return makeInvalidQueryFromDiagnostics(diag);
}
- auto actualSource = origMatcherSource.slice(0, origMatcherSource.size() -
- matcherSource.size());
+ auto actualSource = origMatcherSource.substr(0, origMatcherSource.size() -
+ matcherSource.size());
QueryRef query = new MatchQuery(actualSource, *matcher);
query->remainingContent = matcherSource;
return query;
|
|
@llvm/pr-subscribers-mlir-core Author: Kazu Hirata (kazutakahirata) ChangesI'm planning to migrate StringRef to std::string_view slice(0, N) to substr(0, N) Full diff: https://github.com/llvm/llvm-project/pull/113788.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Support/IndentedOstream.h b/mlir/include/mlir/Support/IndentedOstream.h
index 101aa8b631d299..eeab36806c4ee7 100644
--- a/mlir/include/mlir/Support/IndentedOstream.h
+++ b/mlir/include/mlir/Support/IndentedOstream.h
@@ -166,8 +166,7 @@ inline void mlir::raw_indented_ostream::write_impl(const char *ptr,
break;
}
- auto split =
- std::make_pair(str.slice(0, idx), str.slice(idx + 1, StringRef::npos));
+ auto split = std::make_pair(str.substr(0, idx), str.substr(idx + 1));
// Print empty new line without spaces if line only has spaces and no extra
// prefix is requested.
if (!split.first.ltrim().empty() || !currentExtraPrefix.empty())
diff --git a/mlir/lib/Query/QueryParser.cpp b/mlir/lib/Query/QueryParser.cpp
index 13ee931cc5227f..31aead7d403d0d 100644
--- a/mlir/lib/Query/QueryParser.cpp
+++ b/mlir/lib/Query/QueryParser.cpp
@@ -181,8 +181,8 @@ QueryRef QueryParser::doParse() {
if (!matcher) {
return makeInvalidQueryFromDiagnostics(diag);
}
- auto actualSource = origMatcherSource.slice(0, origMatcherSource.size() -
- matcherSource.size());
+ auto actualSource = origMatcherSource.substr(0, origMatcherSource.size() -
+ matcherSource.size());
QueryRef query = new MatchQuery(actualSource, *matcher);
query->remainingContent = matcherSource;
return query;
|
joker-eph
approved these changes
Oct 27, 2024
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
I'm planning to migrate StringRef to std::string_view eventually. Since std::string_view does not have slice, this patch migrates: slice(0, N) to substr(0, N) slice(N, StringRef::npos) to substr(N)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm planning to migrate StringRef to std::string_view
eventually. Since std::string_view does not have slice, this patch
migrates:
slice(0, N) to substr(0, N)
slice(N, StringRef::npos) to substr(N)