1 files changed, 15 insertions, 13 deletions

diff --git a/clang-tools-extra/clangd/index/SymbolID.cpp b/clang-tools-extra/clangd/index/SymbolID.cpp
index 0ab74810a92..1fd427445f7 100644
--- a/clang-tools-extra/clangd/index/SymbolID.cpp
+++ b/clang-tools-extra/clangd/index/SymbolID.cpp
@@ -10,40 +10,42 @@
 #include "SymbolID.h"
 #include "llvm/Support/SHA1.h"
 
-using namespace llvm;
 namespace clang {
 namespace clangd {
 
-SymbolID::SymbolID(StringRef USR) {
-  auto Hash = llvm::SHA1::hash(arrayRefFromStringRef(USR));
+SymbolID::SymbolID(llvm::StringRef USR) {
+  auto Hash = llvm::SHA1::hash(llvm::arrayRefFromStringRef(USR));
   static_assert(sizeof(Hash) >= RawSize, "RawSize larger than SHA1");
   memcpy(HashValue.data(), Hash.data(), RawSize);
 }
 
 llvm::StringRef SymbolID::raw() const {
-  return StringRef(reinterpret_cast<const char *>(HashValue.data()), RawSize);
+  return llvm::StringRef(reinterpret_cast<const char *>(HashValue.data()),
+                         RawSize);
 }
 
-SymbolID SymbolID::fromRaw(StringRef Raw) {
+SymbolID SymbolID::fromRaw(llvm::StringRef Raw) {
   SymbolID ID;
   assert(Raw.size() == RawSize);
   memcpy(ID.HashValue.data(), Raw.data(), RawSize);
   return ID;
 }
 
-std::string SymbolID::str() const { return toHex(raw()); }
+std::string SymbolID::str() const { return llvm::toHex(raw()); }
 
-Expected<SymbolID> SymbolID::fromStr(StringRef Str) {
+llvm::Expected<SymbolID> SymbolID::fromStr(llvm::StringRef Str) {
   if (Str.size() != RawSize * 2)
-    return createStringError(inconvertibleErrorCode(), "Bad ID length");
+    return llvm::createStringError(llvm::inconvertibleErrorCode(),
+                                   "Bad ID length");
   for (char C : Str)
-    if (!isHexDigit(C))
-      return createStringError(inconvertibleErrorCode(), "Bad hex ID");
-  return fromRaw(fromHex(Str));
+    if (!llvm::isHexDigit(C))
+      return llvm::createStringError(llvm::inconvertibleErrorCode(),
+                                     "Bad hex ID");
+  return fromRaw(llvm::fromHex(Str));
 }
 
-raw_ostream &operator<<(raw_ostream &OS, const SymbolID &ID) {
-  return OS << toHex(ID.raw());
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const SymbolID &ID) {
+  return OS << llvm::toHex(ID.raw());
 }
 
 llvm::hash_code hash_value(const SymbolID &ID) {