diff options
| author | Dennis Kormalev <denk@google.com> | 2022-04-01 15:48:39 +0000 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-01 21:21:04 +0000 |
| commit | e730306f359ce75e7781b60a008fa08d2284a1bb (patch) | |
| tree | 048e1746d47db80cf22691fe3bd6fe76fcfc5532 | |
| parent | ab236a46da40278bf280b98528228bc9b03c4034 (diff) | |
| download | pigweed-e730306f359ce75e7781b60a008fa08d2284a1bb.tar.gz | |
pw_rpc: don't use pw::Result inside PW_TRY_ASSIGN
Change-Id: I9510a3c881f1c6cda4d8edfda5addedb9a21af85
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/89540
Pigweed-Auto-Submit: Dennis Kormalev <denk@google.com>
Reviewed-by: Alexei Frolov <frolv@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
| -rw-r--r-- | pw_rpc/client.cc | 4 | ||||
| -rw-r--r-- | pw_rpc/server.cc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pw_rpc/client.cc b/pw_rpc/client.cc index 4aa740437..21a950d0a 100644 --- a/pw_rpc/client.cc +++ b/pw_rpc/client.cc @@ -32,9 +32,7 @@ using internal::PacketType; } // namespace Status Client::ProcessPacket(ConstByteSpan data) { - PW_TRY_ASSIGN(Result<Packet> result, - Endpoint::ProcessPacket(data, Packet::kClient)); - Packet& packet = *result; + PW_TRY_ASSIGN(Packet packet, Endpoint::ProcessPacket(data, Packet::kClient)); // Find an existing call for this RPC, if any. internal::rpc_lock().lock(); diff --git a/pw_rpc/server.cc b/pw_rpc/server.cc index 78681b53f..d7634ab6b 100644 --- a/pw_rpc/server.cc +++ b/pw_rpc/server.cc @@ -34,9 +34,8 @@ using internal::PacketType; Status Server::ProcessPacket(ConstByteSpan packet_data, ChannelOutput* interface) { - PW_TRY_ASSIGN(Result<Packet> result, + PW_TRY_ASSIGN(Packet packet, Endpoint::ProcessPacket(packet_data, Packet::kServer)); - Packet& packet = *result; internal::rpc_lock().lock(); internal::ServerCall* const call = |