From: Fangrui Song <maskray@google.com>
Date: Sun, 7 Oct 2018 17:21:08 +0000 (+0000)
Subject: [clangd] Migrate to LLVM STLExtras range API
X-Git-Tag: llvmorg-8.0.0-rc1~7079
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8380c9e918c2b1be0840fe67bb394419ec41ea83;p=platform%2Fupstream%2Fllvm.git

[clangd] Migrate to LLVM STLExtras range API

llvm-svn: 343946
---

diff --git a/clang-tools-extra/clangd/FileDistance.cpp b/clang-tools-extra/clangd/FileDistance.cpp
index e24d030..e530ad5 100644
--- a/clang-tools-extra/clangd/FileDistance.cpp
+++ b/clang-tools-extra/clangd/FileDistance.cpp
@@ -72,8 +72,8 @@ FileDistance::FileDistance(StringMap<SourceParams> Sources,
       Rest = parent_path(Rest, sys::path::Style::posix);
       auto NextHash = hash_value(Rest);
       auto &Down = DownEdges[NextHash];
-      if (std::find(Down.begin(), Down.end(), Hash) == Down.end())
-        DownEdges[NextHash].push_back(Hash);
+      if (!llvm::is_contained(Down, Hash))
+        Down.push_back(Hash);
       // We can't just break after MaxUpTraversals, must still set DownEdges.
       if (I > S.getValue().MaxUpTraversals) {
         if (Cache.find(Hash) != Cache.end())
diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp
index 7d9635e..4c71822 100644
--- a/clang-tools-extra/clangd/XRefs.cpp
+++ b/clang-tools-extra/clangd/XRefs.cpp
@@ -372,11 +372,10 @@ public:
   }
 
   std::vector<Reference> take() && {
-    std::sort(References.begin(), References.end(),
-              [](const Reference &L, const Reference &R) {
-                return std::tie(L.Loc, L.CanonicalTarget, L.Role) <
-                       std::tie(R.Loc, R.CanonicalTarget, R.Role);
-              });
+    llvm::sort(References, [](const Reference &L, const Reference &R) {
+      return std::tie(L.Loc, L.CanonicalTarget, L.Role) <
+             std::tie(R.Loc, R.CanonicalTarget, R.Role);
+    });
     // We sometimes see duplicates when parts of the AST get traversed twice.
     References.erase(
         std::unique(References.begin(), References.end(),