Author: Kazu Hirata Date: 2022-07-29T21:18:42-07:00 New Revision: 873888c179744eb0a35d4b6d69424c6adf3d08d4
URL: https://github.com/llvm/llvm-project/commit/873888c179744eb0a35d4b6d69424c6adf3d08d4 DIFF: https://github.com/llvm/llvm-project/commit/873888c179744eb0a35d4b6d69424c6adf3d08d4.diff LOG: Use is_sorted (NFC) Added: Modified: clang-tools-extra/clangd/SemanticHighlighting.cpp clang-tools-extra/clangd/refactor/Rename.cpp clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp clang/lib/Format/BreakableToken.cpp lld/COFF/DebugTypes.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/SemanticHighlighting.cpp b/clang-tools-extra/clangd/SemanticHighlighting.cpp index 63d01deb33704..7599c1eff0181 100644 --- a/clang-tools-extra/clangd/SemanticHighlighting.cpp +++ b/clang-tools-extra/clangd/SemanticHighlighting.cpp @@ -943,7 +943,7 @@ bool operator<(const HighlightingToken &L, const HighlightingToken &R) { std::vector<SemanticToken> toSemanticTokens(llvm::ArrayRef<HighlightingToken> Tokens, llvm::StringRef Code) { - assert(std::is_sorted(Tokens.begin(), Tokens.end())); + assert(llvm::is_sorted(Tokens)); std::vector<SemanticToken> Result; // In case we split a HighlightingToken into multiple tokens (e.g. because it // was spanning multiple lines), this tracks the last one. This prevents diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp b/clang-tools-extra/clangd/refactor/Rename.cpp index 83df990d35cd9..50b5481e4f89b 100644 --- a/clang-tools-extra/clangd/refactor/Rename.cpp +++ b/clang-tools-extra/clangd/refactor/Rename.cpp @@ -809,7 +809,7 @@ llvm::Expected<Edit> buildRenameEdit(llvm::StringRef AbsFilePath, SPAN_ATTACH(Tracer, "rename_occurrences", static_cast<int64_t>(Occurrences.size())); - assert(std::is_sorted(Occurrences.begin(), Occurrences.end())); + assert(llvm::is_sorted(Occurrences)); assert(std::unique(Occurrences.begin(), Occurrences.end()) == Occurrences.end() && "Occurrences must be unique"); @@ -872,7 +872,7 @@ adjustRenameRanges(llvm::StringRef DraftCode, llvm::StringRef Identifier, std::vector<Range> Indexed, const LangOptions &LangOpts) { trace::Span Tracer("AdjustRenameRanges"); assert(!Indexed.empty()); - assert(std::is_sorted(Indexed.begin(), Indexed.end())); + assert(llvm::is_sorted(Indexed)); std::vector<Range> Lexed = collectIdentifierRanges(Identifier, DraftCode, LangOpts); llvm::sort(Lexed); @@ -883,8 +883,8 @@ llvm::Optional<std::vector<Range>> getMappedRanges(ArrayRef<Range> Indexed, ArrayRef<Range> Lexed) { trace::Span Tracer("GetMappedRanges"); assert(!Indexed.empty()); - assert(std::is_sorted(Indexed.begin(), Indexed.end())); - assert(std::is_sorted(Lexed.begin(), Lexed.end())); + assert(llvm::is_sorted(Indexed)); + assert(llvm::is_sorted(Lexed)); if (Indexed.size() > Lexed.size()) { vlog("The number of lexed occurrences is less than indexed occurrences"); @@ -950,8 +950,8 @@ llvm::Optional<std::vector<Range>> getMappedRanges(ArrayRef<Range> Indexed, size_t renameRangeAdjustmentCost(ArrayRef<Range> Indexed, ArrayRef<Range> Lexed, ArrayRef<size_t> MappedIndex) { assert(Indexed.size() == MappedIndex.size()); - assert(std::is_sorted(Indexed.begin(), Indexed.end())); - assert(std::is_sorted(Lexed.begin(), Lexed.end())); + assert(llvm::is_sorted(Indexed)); + assert(llvm::is_sorted(Lexed)); int LastLine = -1; int LastDLine = 0, LastDColumn = 0; diff --git a/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp b/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp index 384840c93f660..128cd620d710e 100644 --- a/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ b/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -34,9 +34,8 @@ using testing::SizeIs; /// }; std::string annotate(llvm::StringRef Input, llvm::ArrayRef<HighlightingToken> Tokens) { - assert(std::is_sorted( - Tokens.begin(), Tokens.end(), - [](const HighlightingToken &L, const HighlightingToken &R) { + assert(llvm::is_sorted( + Tokens, [](const HighlightingToken &L, const HighlightingToken &R) { return L.R.start < R.R.start; })); diff --git a/clang/lib/Format/BreakableToken.cpp b/clang/lib/Format/BreakableToken.cpp index db82018a4c83c..b3ef2a895d7f0 100644 --- a/clang/lib/Format/BreakableToken.cpp +++ b/clang/lib/Format/BreakableToken.cpp @@ -49,10 +49,10 @@ static StringRef getLineCommentIndentPrefix(StringRef Comment, if (Style.Language == FormatStyle::LK_TextProto) KnownPrefixes = KnownTextProtoPrefixes; - assert(std::is_sorted(KnownPrefixes.begin(), KnownPrefixes.end(), - [](StringRef Lhs, StringRef Rhs) noexcept { - return Lhs.size() > Rhs.size(); - })); + assert( + llvm::is_sorted(KnownPrefixes, [](StringRef Lhs, StringRef Rhs) noexcept { + return Lhs.size() > Rhs.size(); + })); for (StringRef KnownPrefix : KnownPrefixes) { if (Comment.startswith(KnownPrefix)) { diff --git a/lld/COFF/DebugTypes.cpp b/lld/COFF/DebugTypes.cpp index 800b40f343aa9..a92470e037484 100644 --- a/lld/COFF/DebugTypes.cpp +++ b/lld/COFF/DebugTypes.cpp @@ -647,7 +647,7 @@ void TpiSource::mergeUniqueTypeRecords(ArrayRef<uint8_t> typeRecords, TypeIndex beginIndex) { // Re-sort the list of unique types by index. if (kind == PDB) - assert(std::is_sorted(uniqueTypes.begin(), uniqueTypes.end())); + assert(llvm::is_sorted(uniqueTypes)); else llvm::sort(uniqueTypes); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
