[clang-tools-extra] r341182 - [NFC] Use LLVM naming conventions within FileDistance

[Kirill Bobyrev via cfe-commits]

Author: omtcyfz
Date: Fri Aug 31 01:19:50 2018
New Revision: 341182

URL: http://llvm.org/viewvc/llvm-project?rev=341182&view=rev
Log:
[NFC] Use LLVM naming conventions within FileDistance

Reviewed by: sammccall

Differential Revision: https://reviews.llvm.org/D51527

Modified:
    clang-tools-extra/trunk/clangd/FileDistance.cpp
    clang-tools-extra/trunk/clangd/FileDistance.h

Modified: clang-tools-extra/trunk/clangd/FileDistance.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/FileDistance.cpp?rev=341182&r1=341181&r2=341182&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/FileDistance.cpp (original)
+++ clang-tools-extra/trunk/clangd/FileDistance.cpp Fri Aug 31 01:19:50 2018
@@ -102,7 +102,7 @@ FileDistance::FileDistance(StringMap<Sou
     auto ParentCost = Cache.lookup(Next.front());
     for (auto Child : DownEdges.lookup(Next.front())) {
       auto &ChildCost =
-          Cache.try_emplace(Child, kUnreachable).first->getSecond();
+          Cache.try_emplace(Child, Unreachable).first->getSecond();
       if (ParentCost + Opts.DownCost < ChildCost)
         ChildCost = ParentCost + Opts.DownCost;
       Next.push(Child);
@@ -113,7 +113,7 @@ FileDistance::FileDistance(StringMap<Sou
 
 unsigned FileDistance::distance(StringRef Path) {
   auto Canonical = canonicalize(Path);
-  unsigned Cost = kUnreachable;
+  unsigned Cost = Unreachable;
   SmallVector<hash_code, 16> Ancestors;
   // Walk up ancestors until we find a path we know the distance for.
   for (StringRef Rest = Canonical; !Rest.empty();
@@ -129,7 +129,7 @@ unsigned FileDistance::distance(StringRe
   // Now we know the costs for (known node, queried node].
   // Fill these in, walking down the directory tree.
   for (hash_code Hash : reverse(Ancestors)) {
-    if (Cost != kUnreachable)
+    if (Cost != Unreachable)
       Cost += Opts.DownCost;
     Cache.try_emplace(Hash, Cost);
   }
@@ -138,7 +138,7 @@ unsigned FileDistance::distance(StringRe
 }
 
 unsigned URIDistance::distance(llvm::StringRef URI) {
-  auto R = Cache.try_emplace(llvm::hash_value(URI), FileDistance::kUnreachable);
+  auto R = Cache.try_emplace(llvm::hash_value(URI), FileDistance::Unreachable);
   if (!R.second)
     return R.first->getSecond();
   if (auto U = clangd::URI::parse(URI)) {

Modified: clang-tools-extra/trunk/clangd/FileDistance.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/FileDistance.h?rev=341182&r1=341181&r2=341182&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/FileDistance.h (original)
+++ clang-tools-extra/trunk/clangd/FileDistance.h Fri Aug 31 01:19:50 2018
@@ -66,7 +66,7 @@ struct SourceParams {
 // This object should be reused, it memoizes intermediate computations.
 class FileDistance {
 public:
-  static constexpr unsigned kUnreachable = std::numeric_limits<unsigned>::max();
+  static constexpr unsigned Unreachable = std::numeric_limits<unsigned>::max();
 
   FileDistance(llvm::StringMap<SourceParams> Sources,
                const FileDistanceOptions &Opts = {});