diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2018-10-20 15:30:37 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2018-10-20 15:30:37 +0000 |
| commit | c008af646620f6718384c2cd95f58a7311fe10fb (patch) | |
| tree | 4961c6079af876f19462df09f9a0d0fa1176a824 /clang-tools-extra/clangd/index/Serialization.cpp | |
| parent | 0c35aa114d34c4f8add2a532de3a797ef0c1b667 (diff) | |
| download | bcm5719-llvm-c008af646620f6718384c2cd95f58a7311fe10fb.tar.gz bcm5719-llvm-c008af646620f6718384c2cd95f58a7311fe10fb.zip | |
[clangd] Namespace style cleanup in cpp files. NFC.
Standardize on the most common namespace setup in our *.cpp files:
using namespace llvm;
namespace clang {
namespace clangd {
void foo(StringRef) { ... }
And remove redundant llvm:: qualifiers. (Except for cases like
make_unique where this causes problems with std:: and ADL).
This choice is pretty arbitrary, but some broad consistency is nice.
This is going to conflict with everything. Sorry :-/
Squash the other configurations:
A)
using namespace llvm;
using namespace clang;
using namespace clangd;
void clangd::foo(StringRef);
This is in some of the older files. (It prevents accidentally defining a
new function instead of one in the header file, for what that's worth).
B)
namespace clang {
namespace clangd {
void foo(llvm::StringRef) { ... }
This is fine, but in practice the using directive often gets added over time.
C)
namespace clang {
namespace clangd {
using namespace llvm; // inside the namespace
This was pretty common, but is a bit misleading: name lookup preferrs
clang::clangd::foo > clang::foo > llvm:: foo (no matter where the using
directive is).
llvm-svn: 344850
Diffstat (limited to 'clang-tools-extra/clangd/index/Serialization.cpp')
| -rw-r--r-- | clang-tools-extra/clangd/index/Serialization.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang-tools-extra/clangd/index/Serialization.cpp b/clang-tools-extra/clangd/index/Serialization.cpp index f2e65c930c2..fa08eb106c0 100644 --- a/clang-tools-extra/clangd/index/Serialization.cpp +++ b/clang-tools-extra/clangd/index/Serialization.cpp @@ -448,7 +448,7 @@ void writeRIFF(const IndexFileOut &Data, raw_ostream &OS) { void writeYAML(const IndexFileOut &, raw_ostream &); Expected<IndexFileIn> readYAML(StringRef); -llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const IndexFileOut &O) { +raw_ostream &operator<<(raw_ostream &OS, const IndexFileOut &O) { switch (O.Format) { case IndexFileFormat::RIFF: writeRIFF(O, OS); @@ -467,17 +467,17 @@ Expected<IndexFileIn> readIndexFile(StringRef Data) { return std::move(*YAMLContents); } else { return makeError("Not a RIFF file and failed to parse as YAML: " + - llvm::toString(YAMLContents.takeError())); + toString(YAMLContents.takeError())); } } -std::unique_ptr<SymbolIndex> loadIndex(llvm::StringRef SymbolFilename, - llvm::ArrayRef<std::string> URISchemes, +std::unique_ptr<SymbolIndex> loadIndex(StringRef SymbolFilename, + ArrayRef<std::string> URISchemes, bool UseDex) { trace::Span OverallTracer("LoadIndex"); auto Buffer = MemoryBuffer::getFile(SymbolFilename); if (!Buffer) { - llvm::errs() << "Can't open " << SymbolFilename << "\n"; + errs() << "Can't open " << SymbolFilename << "\n"; return nullptr; } @@ -491,7 +491,7 @@ std::unique_ptr<SymbolIndex> loadIndex(llvm::StringRef SymbolFilename, if (I->Refs) Refs = std::move(*I->Refs); } else { - llvm::errs() << "Bad Index: " << llvm::toString(I.takeError()) << "\n"; + errs() << "Bad Index: " << toString(I.takeError()) << "\n"; return nullptr; } } |

