[PATCH] D51527: [NFC] Use LLVM naming conventions within FileDistance

[Kirill Bobyrev via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rCTE341182: [NFC] Use LLVM naming conventions within FileDistance (authored by omtcyfz, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D51527?vs=163474&id=163476#toc

Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D51527

Files:
  clangd/FileDistance.cpp
  clangd/FileDistance.h


Index: clangd/FileDistance.h
===================================================================
--- clangd/FileDistance.h
+++ clangd/FileDistance.h
@@ -66,7 +66,7 @@
 // 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 = {});
Index: clangd/FileDistance.cpp
===================================================================
--- clangd/FileDistance.cpp
+++ clangd/FileDistance.cpp
@@ -102,7 +102,7 @@
     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 @@
 
 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,16 +129,16 @@
   // 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);
   }
   dlog("distance({0} = {1})", Path, Cost);
   return Cost;
 }
 
 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)) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51527.163476.patch
Type: text/x-patch
Size: 2152 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180831/51d7b467/attachment.bin>