[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGc21378f90a44: [clangd/index/remote]NFC: Adapt code to newer
grpc/protobuf versions (authored by MatzeB).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D144599/new/
https://reviews.llvm.org/D144599
Files:
clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,9 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(),
+static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,9 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(),
+static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
MatzeB updated this revision to Diff 499909.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D144599/new/
https://reviews.llvm.org/D144599
Files:
clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,9 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(),
+static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,9 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(),
+static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
MatzeB added a comment. > Asking as it'd be great to know that we've adoption here, outside of > ourselves. I'm not involved in any of this myself. But @kuganv is :) Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D144599/new/ https://reviews.llvm.org/D144599 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
kuganv added a comment. > if you don't mind me asking, are you deliberately building remote-index > components? i.e. do you have an internal remote-index server/deployment ? > Asking as it'd be great to know that we've adoption here, outside of > ourselves. > > OTOH, if you're not actually using it, this shouldn't be built unless > `-DCLANGD_ENABLE_REMOTE=1 ` is part of the build config, hence we might have > a bug in the build configuration and I'd like to make sure it's fixed. Thanks for looking into it. Yes, we use -DCLANGD_ENABLE_REMOTE=On and provide grpc path with -DGRPC_INSTALL_PATH. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D144599/new/ https://reviews.llvm.org/D144599 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
kadircet accepted this revision. kadircet added a comment. This revision is now accepted and ready to land. thanks, indeed the protobuf version used by grpc-1.36.3 has these available, https://github.com/protocolbuffers/protobuf/blob/19fb89416f3fdc2d6668f3738f444885575285bc/src/google/protobuf/stubs/status.h. if you don't mind me asking, are you deliberately building remote-index components? i.e. do you have an internal remote-index server/deployment ? Asking as it'd be great to know that we've adoption here, outside of ourselves. OTOH, if you're not actually using it, this shouldn't be built unless `-DCLANGD_ENABLE_REMOTE=1 ` is part of the build config, hence we might have a bug in the build configuration and I'd like to make sure it's fixed. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D144599/new/ https://reviews.llvm.org/D144599 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
MatzeB added a comment. I need this change to fix compilation in our environment which uses `grpc-1.42.0`... Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D144599/new/ https://reviews.llvm.org/D144599 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions
MatzeB created this revision.
MatzeB added reviewers: kbobyrev, kuganv.
Herald added subscribers: modimo, wenlei, kadircet, arphaman, mcrosier.
Herald added a project: All.
MatzeB requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang-tools-extra.
It seems newer grpc / protobuf versions renamed
`Status::error_message()` and `Status::error_code()` to `message()`
and `code()` to prepare for replacement with `absl::Status` with the
same names.
As far as I can tell the new names are already available in the
grpc-1.36 version mentioned in the `README` file.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D144599
Files:
clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,8 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(),
static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,8 @@
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
-Response.DebugString(), JsonStatus.error_code(),
-JsonStatus.error_message().as_string());
+Response.DebugString(), static_cast(JsonStatus.code()),
+JsonStatus.message().as_string());
return -1;
}
llvm::outs() << Output;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
