commit 620bc91896ca2a1af633c0f9fbf08e41455d821a
author Dmitri Gribenko <dmitrig@google.com> Fri Apr 22 03:38:04 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 22 03:38:27 2022 -0700
tree ede3a1a50a6b2e4e20d6841b97c7f0baea1c87e2
parent c0543eb701bbbc447f1b8437f4c8d2586026715e

Use llvm::sort that takes the whole collection

PiperOrigin-RevId: 443620514

rs_bindings_from_cc/importer.cc

diff --git a/rs_bindings_from_cc/importer.cc b/rs_bindings_from_cc/importer.cc
index 7a06e11..cdee63b 100644
--- a/rs_bindings_from_cc/importer.cc
+++ b/rs_bindings_from_cc/importer.cc
@@ -320,7 +320,7 @@
   for (auto& [_, comment] : ordered_comments) {
     items.push_back({comment->getSourceRange(), 0, GenerateItemId(comment)});
   }
-  std::sort(items.begin(), items.end(), compare_locations);
+  llvm::sort(items, compare_locations);
 
   std::vector<ItemId> ordered_item_ids;
   ordered_item_ids.reserve(items.size());
@@ -342,7 +342,7 @@
       }
     }
   }
-  std::sort(comments_.begin(), comments_.end(), SourceLocationComparator(sm));
+  llvm::sort(comments_, SourceLocationComparator(sm));
 }
 
 void Importer::Import(clang::TranslationUnitDecl* translation_unit_decl) {
@@ -369,8 +369,7 @@
     }
   }
 
-  std::sort(ordered_items.begin(), ordered_items.end(),
-            SourceLocationComparator(sm));
+  llvm::sort(ordered_items, SourceLocationComparator(sm));
 
   invocation_.ir_.items.reserve(ordered_items.size());
   for (auto& ordered_item : ordered_items) {
@@ -585,10 +584,10 @@
     lifetime_params.push_back(
         {.name = name->str(), .id = LifetimeId(lifetime.Id())});
   }
-  std::sort(lifetime_params.begin(), lifetime_params.end(),
-            [](const LifetimeName& l1, const LifetimeName& l2) {
-              return l1.name < l2.name;
-            });
+  llvm::sort(lifetime_params,
+             [](const LifetimeName& l1, const LifetimeName& l2) {
+               return l1.name < l2.name;
+             });
 
   llvm::Optional<MemberFuncMetadata> member_func_metadata;
   if (auto* method_decl =