upb: remove the last remaining direct upb-internal deps from upb/protos/

PiperOrigin-RevId: 600933411
pull/15538/head
Eric Salo 1 year ago committed by Copybara-Service
parent 64441a20d3
commit f9994e1c8d
  1. 2
      protos/BUILD
  2. 12
      protos/protos.cc
  3. 2
      protos/protos.h

@ -58,10 +58,8 @@ cc_library(
"//upb:message_copy",
"//upb:message_promote",
"//upb:mini_table",
"//upb:port",
"//upb:wire",
"//upb:wire_reader",
"//upb/message:internal",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",

@ -16,8 +16,8 @@
#include "absl/strings/string_view.h"
#include "protos/protos_extension_lock.h"
#include "upb/mem/arena.h"
#include "upb/message/accessors.h"
#include "upb/message/copy.h"
#include "upb/message/internal/extension.h"
#include "upb/message/message.h"
#include "upb/message/promote.h"
#include "upb/message/value.h"
@ -27,9 +27,6 @@
#include "upb/wire/decode.h"
#include "upb/wire/encode.h"
// Must be last.
#include "upb/port/def.inc"
namespace protos {
// begin:google_only
@ -118,9 +115,10 @@ class MessageLock {
bool HasExtensionOrUnknown(const upb_Message* msg,
const upb_MiniTableExtension* eid) {
MessageLock msg_lock(msg);
return UPB_PRIVATE(_upb_Message_Getext)(msg, eid) != nullptr ||
upb_Message_FindUnknown(msg, upb_MiniTableExtension_Number(eid), 0)
.status == kUpb_FindUnknown_Ok;
if (upb_Message_HasExtension(msg, eid)) return true;
const int number = upb_MiniTableExtension_Number(eid);
return upb_Message_FindUnknown(msg, number, 0).status == kUpb_FindUnknown_Ok;
}
bool GetOrPromoteExtension(upb_Message* msg, const upb_MiniTableExtension* eid,

@ -16,8 +16,6 @@
#include "upb/base/status.hpp"
#include "upb/mem/arena.hpp"
#include "upb/message/copy.h"
#include "upb/message/internal/accessors.h"
#include "upb/message/internal/extension.h"
#include "upb/mini_table/extension.h"
#include "upb/wire/decode.h"
#include "upb/wire/encode.h"

Loading…
Cancel
Save