diff options
-rw-r--r-- | clang-tools-extra/clangd/FileDistance.cpp | 8 | ||||
-rw-r--r-- | clang-tools-extra/clangd/FileDistance.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang-tools-extra/clangd/FileDistance.cpp b/clang-tools-extra/clangd/FileDistance.cpp index a0ce25b48fa..c25ad9ac5b5 100644 --- a/clang-tools-extra/clangd/FileDistance.cpp +++ b/clang-tools-extra/clangd/FileDistance.cpp @@ -102,7 +102,7 @@ FileDistance::FileDistance(StringMap<SourceParams> Sources, 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<SourceParams> Sources, 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(StringRef Path) { // 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(StringRef Path) { } 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)) { diff --git a/clang-tools-extra/clangd/FileDistance.h b/clang-tools-extra/clangd/FileDistance.h index f07804fcb7c..631fddf5edc 100644 --- a/clang-tools-extra/clangd/FileDistance.h +++ b/clang-tools-extra/clangd/FileDistance.h @@ -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 = {}); |