1 files changed, 10 insertions, 11 deletions

diff --git a/clang-tools-extra/clangd/RIFF.cpp b/clang-tools-extra/clangd/RIFF.cpp
index 19722b620d4..c0bf7855fcb 100644
--- a/clang-tools-extra/clangd/RIFF.cpp
+++ b/clang-tools-extra/clangd/RIFF.cpp
@@ -10,22 +10,21 @@
 #include "RIFF.h"
 #include "llvm/Support/Endian.h"
 
-using namespace llvm;
 namespace clang {
 namespace clangd {
 namespace riff {
 
-static Error makeError(const char *Msg) {
-  return createStringError(inconvertibleErrorCode(), Msg);
+static llvm::Error makeError(const char *Msg) {
+  return llvm::createStringError(llvm::inconvertibleErrorCode(), Msg);
 }
 
-Expected<Chunk> readChunk(StringRef &Stream) {
+llvm::Expected<Chunk> readChunk(llvm::StringRef &Stream) {
   if (Stream.size() < 8)
     return makeError("incomplete chunk header");
   Chunk C;
   std::copy(Stream.begin(), Stream.begin() + 4, C.ID.begin());
   Stream = Stream.drop_front(4);
-  uint32_t Len = support::endian::read32le(Stream.take_front(4).begin());
+  uint32_t Len = llvm::support::endian::read32le(Stream.take_front(4).begin());
   Stream = Stream.drop_front(4);
   if (Stream.size() < Len)
     return makeError("truncated chunk");
@@ -39,10 +38,10 @@ Expected<Chunk> readChunk(StringRef &Stream) {
   return std::move(C);
 }
 
-raw_ostream &operator<<(raw_ostream &OS, const Chunk &C) {
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const Chunk &C) {
   OS.write(C.ID.data(), C.ID.size());
   char Size[4];
-  support::endian::write32le(Size, C.Data.size());
+  llvm::support::endian::write32le(Size, C.Data.size());
   OS.write(Size, sizeof(Size));
   OS << C.Data;
   if (C.Data.size() % 2)
@@ -50,7 +49,7 @@ raw_ostream &operator<<(raw_ostream &OS, const Chunk &C) {
   return OS;
 }
 
-Expected<File> readFile(StringRef Stream) {
+llvm::Expected<File> readFile(llvm::StringRef Stream) {
   auto RIFF = readChunk(Stream);
   if (!RIFF)
     return RIFF.takeError();
@@ -60,7 +59,7 @@ Expected<File> readFile(StringRef Stream) {
     return makeError("RIFF chunk too short");
   File F;
   std::copy(RIFF->Data.begin(), RIFF->Data.begin() + 4, F.Type.begin());
-  for (StringRef Body = RIFF->Data.drop_front(4); !Body.empty();)
+  for (llvm::StringRef Body = RIFF->Data.drop_front(4); !Body.empty();)
     if (auto Chunk = readChunk(Body)) {
       F.Chunks.push_back(*Chunk);
     } else
@@ -68,14 +67,14 @@ Expected<File> readFile(StringRef Stream) {
   return std::move(F);
 }
 
-raw_ostream &operator<<(raw_ostream &OS, const File &F) {
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const File &F) {
   // To avoid copies, we serialize the outer RIFF chunk "by hand".
   size_t DataLen = 4; // Predict length of RIFF chunk data.
   for (const auto &C : F.Chunks)
     DataLen += 4 + 4 + C.Data.size() + (C.Data.size() % 2);
   OS << "RIFF";
   char Size[4];
-  support::endian::write32le(Size, DataLen);
+  llvm::support::endian::write32le(Size, DataLen);
   OS.write(Size, sizeof(Size));
   OS.write(F.Type.data(), F.Type.size());
   for (const auto &C : F.Chunks)