diff options
author | Sam McCall <sam.mccall@gmail.com> | 2018-07-09 14:25:59 +0000 |
---|---|---|
committer | Sam McCall <sam.mccall@gmail.com> | 2018-07-09 14:25:59 +0000 |
commit | d20d7989c678f9458df7880f7644b3316ee5f1dd (patch) | |
tree | 78af542bf097f028e8fd6dfd98cce481c47e7860 /clang-tools-extra/clangd/CodeComplete.cpp | |
parent | 3d76326d24310638fff26267e24b5473b543913d (diff) | |
download | bcm5719-llvm-d20d7989c678f9458df7880f7644b3316ee5f1dd.tar.gz bcm5719-llvm-d20d7989c678f9458df7880f7644b3316ee5f1dd.zip |
[clangd] Remove JSON library in favor of llvm/Support/JSON
Summary:
The library has graduated from clangd to llvm/Support.
This is a mechanical change to move to the new API and remove the old one.
Main API changes:
- namespace clang::clangd::json --> llvm::json
- json::Expr --> json::Value
- Expr::asString() etc --> Value::getAsString() etc
- unsigned longs need a cast (due to r336541 adding lossless integer support)
Reviewers: ilya-biryukov
Subscribers: mgorny, ioeric, MaskRay, jkorous, omtcyfz, cfe-commits
Differential Revision: https://reviews.llvm.org/D49077
llvm-svn: 336549
Diffstat (limited to 'clang-tools-extra/clangd/CodeComplete.cpp')
-rw-r--r-- | clang-tools-extra/clangd/CodeComplete.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp index be252b52b64..ded1113d117 100644 --- a/clang-tools-extra/clangd/CodeComplete.cpp +++ b/clang-tools-extra/clangd/CodeComplete.cpp @@ -1014,7 +1014,7 @@ public: SPAN_ATTACH(Tracer, "sema_results", NSema); SPAN_ATTACH(Tracer, "index_results", NIndex); SPAN_ATTACH(Tracer, "merged_results", NBoth); - SPAN_ATTACH(Tracer, "returned_results", Output.Completions.size()); + SPAN_ATTACH(Tracer, "returned_results", int64_t(Output.Completions.size())); SPAN_ATTACH(Tracer, "incomplete", Output.HasMore); log(llvm::formatv("Code complete: {0} results from Sema, {1} from Index, " "{2} matched, {3} returned{4}.", @@ -1056,7 +1056,7 @@ private: SymbolSlab queryIndex() { trace::Span Tracer("Query index"); - SPAN_ATTACH(Tracer, "limit", Opts.Limit); + SPAN_ATTACH(Tracer, "limit", int64_t(Opts.Limit)); SymbolSlab::Builder ResultsBuilder; // Build the query. |