Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Thunk to ThunkName

Browse Source 
Let's hint at returning a name as opposed to a computed chunk / lambda

PiperOrigin-RevId: 594300381
pull/15213/head
Hong Shin 11 months ago committed by Copybara-Service
parent 37a926e177
commit 4c35408777
9 changed files with 94 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/google/protobuf/compiler/rust/accessors/map.cc
  2. 18
      src/google/protobuf/compiler/rust/accessors/repeated_scalar.cc
  3. 18
      src/google/protobuf/compiler/rust/accessors/singular_message.cc
  4. 24
      src/google/protobuf/compiler/rust/accessors/singular_scalar.cc
  5. 24
      src/google/protobuf/compiler/rust/accessors/singular_string.cc
  6. 40
      src/google/protobuf/compiler/rust/message.cc
  7. 29
      src/google/protobuf/compiler/rust/naming.cc
  8. 7
      src/google/protobuf/compiler/rust/naming.h
  9. 6
      src/google/protobuf/compiler/rust/oneof.cc

12
src/google/protobuf/compiler/rust/accessors/map.cc
Unescape View File

@ -24,8 +24,8 @@ void Map::InMsgImpl(Context& ctx, const FieldDescriptor& field) const {
ctx.Emit({{"field", field.name()}, ctx.Emit({{"field", field.name()},
{"Key", PrimitiveRsTypeName(key_type)}, {"Key", PrimitiveRsTypeName(key_type)},
{"Value", PrimitiveRsTypeName(value_type)}, {"Value", PrimitiveRsTypeName(value_type)},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"getter", {"getter",
[&] { [&] {
if (ctx.is_upb()) { if (ctx.is_upb()) {
@ -97,8 +97,8 @@ void Map::InMsgImpl(Context& ctx, const FieldDescriptor& field) const {
void Map::InExternC(Context& ctx, const FieldDescriptor& field) const { void Map::InExternC(Context& ctx, const FieldDescriptor& field) const {
ctx.Emit( ctx.Emit(
{ {
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"getter", {"getter",
[&] { [&] {
if (ctx.is_upb()) { if (ctx.is_upb()) {
@ -129,8 +129,8 @@ void Map::InThunkCc(Context& ctx, const FieldDescriptor& field) const {
{"Value", {"Value",
cpp::PrimitiveTypeName(field.message_type()->map_value()->cpp_type())}, cpp::PrimitiveTypeName(field.message_type()->map_value()->cpp_type())},
{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())}, {"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"impls", {"impls",
[&] { [&] {
ctx.Emit( ctx.Emit(

18
src/google/protobuf/compiler/rust/accessors/repeated_scalar.cc
Unescape View File

@ -21,8 +21,8 @@ void RepeatedScalar::InMsgImpl(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"field", field.name()}, ctx.Emit({{"field", field.name()},
{"Scalar", PrimitiveRsTypeName(field)}, {"Scalar", PrimitiveRsTypeName(field)},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"getter", {"getter",
[&] { [&] {
if (ctx.is_upb()) { if (ctx.is_upb()) {
@ -54,7 +54,7 @@ void RepeatedScalar::InMsgImpl(Context& ctx,
)rs"); )rs");
} }
}}, }},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"field_mutator_getter", {"field_mutator_getter",
[&] { [&] {
if (ctx.is_upb()) { if (ctx.is_upb()) {
@ -101,8 +101,8 @@ void RepeatedScalar::InMsgImpl(Context& ctx,
void RepeatedScalar::InExternC(Context& ctx, void RepeatedScalar::InExternC(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"Scalar", PrimitiveRsTypeName(field)}, ctx.Emit({{"Scalar", PrimitiveRsTypeName(field)},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"getter", {"getter",
[&] { [&] {
if (ctx.is_upb()) { if (ctx.is_upb()) {
@ -125,7 +125,7 @@ void RepeatedScalar::InExternC(Context& ctx,
)rs"); )rs");
} }
}}, }},
{"clearer_thunk", Thunk(ctx, field, "clear")}}, {"clearer_thunk", ThunkName(ctx, field, "clear")}},
R"rs( R"rs(
fn $clearer_thunk$(raw_msg: $pbi$::RawMessage); fn $clearer_thunk$(raw_msg: $pbi$::RawMessage);
$getter$ $getter$
@ -137,9 +137,9 @@ void RepeatedScalar::InThunkCc(Context& ctx,
ctx.Emit({{"field", cpp::FieldName(&field)}, ctx.Emit({{"field", cpp::FieldName(&field)},
{"Scalar", cpp::PrimitiveTypeName(field.cpp_type())}, {"Scalar", cpp::PrimitiveTypeName(field.cpp_type())},
{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())}, {"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"impls", {"impls",
[&] { [&] {
ctx.Emit( ctx.Emit(

18
src/google/protobuf/compiler/rust/accessors/singular_message.cc
Unescape View File

@ -26,9 +26,9 @@ void SingularMessage::InMsgImpl(Context& ctx,
{ {
{"prefix", prefix}, {"prefix", prefix},
{"field", field.name()}, {"field", field.name()},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{ {
"view_body", "view_body",
[&] { [&] {
@ -91,9 +91,9 @@ void SingularMessage::InExternC(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit( ctx.Emit(
{ {
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"getter_mut", {"getter_mut",
[&] { [&] {
if (ctx.is_cpp()) { if (ctx.is_cpp()) {
@ -130,9 +130,9 @@ void SingularMessage::InExternC(Context& ctx,
void SingularMessage::InThunkCc(Context& ctx, void SingularMessage::InThunkCc(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())}, ctx.Emit({{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"getter_mut_thunk", Thunk(ctx, field, "get_mut")}, {"getter_mut_thunk", ThunkName(ctx, field, "get_mut")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"field", cpp::FieldName(&field)}}, {"field", cpp::FieldName(&field)}},
R"cc( R"cc(
const void* $getter_thunk$($QualifiedMsg$* msg) { const void* $getter_thunk$($QualifiedMsg$* msg) {

24
src/google/protobuf/compiler/rust/accessors/singular_scalar.cc
Unescape View File

@ -24,7 +24,7 @@ void SingularScalar::InMsgImpl(Context& ctx,
{ {
{"field", field.name()}, {"field", field.name()},
{"Scalar", PrimitiveRsTypeName(field)}, {"Scalar", PrimitiveRsTypeName(field)},
{"hazzer_thunk", Thunk(ctx, field, "has")}, {"hazzer_thunk", ThunkName(ctx, field, "has")},
{"default_value", DefaultValue(field)}, {"default_value", DefaultValue(field)},
{"getter", {"getter",
[&] { [&] {
@ -48,9 +48,9 @@ void SingularScalar::InMsgImpl(Context& ctx,
} }
)rs"); )rs");
}}, }},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"setter_thunk", Thunk(ctx, field, "set")}, {"setter_thunk", ThunkName(ctx, field, "set")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"field_mutator_getter", {"field_mutator_getter",
[&] { [&] {
if (field.has_presence()) { if (field.has_presence()) {
@ -118,10 +118,10 @@ void SingularScalar::InMsgImpl(Context& ctx,
void SingularScalar::InExternC(Context& ctx, void SingularScalar::InExternC(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"Scalar", PrimitiveRsTypeName(field)}, ctx.Emit({{"Scalar", PrimitiveRsTypeName(field)},
{"hazzer_thunk", Thunk(ctx, field, "has")}, {"hazzer_thunk", ThunkName(ctx, field, "has")},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"setter_thunk", Thunk(ctx, field, "set")}, {"setter_thunk", ThunkName(ctx, field, "set")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"with_presence_fields_thunks", {"with_presence_fields_thunks",
[&] { [&] {
if (field.has_presence()) { if (field.has_presence()) {
@ -144,10 +144,10 @@ void SingularScalar::InThunkCc(Context& ctx,
ctx.Emit({{"field", cpp::FieldName(&field)}, ctx.Emit({{"field", cpp::FieldName(&field)},
{"Scalar", cpp::PrimitiveTypeName(field.cpp_type())}, {"Scalar", cpp::PrimitiveTypeName(field.cpp_type())},
{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())}, {"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())},
{"hazzer_thunk", Thunk(ctx, field, "has")}, {"hazzer_thunk", ThunkName(ctx, field, "has")},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"setter_thunk", Thunk(ctx, field, "set")}, {"setter_thunk", ThunkName(ctx, field, "set")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"with_presence_fields_thunks", {"with_presence_fields_thunks",
[&] { [&] {
if (field.has_presence()) { if (field.has_presence()) {

24
src/google/protobuf/compiler/rust/accessors/singular_string.cc
Unescape View File

@ -22,9 +22,9 @@ namespace rust {
void SingularString::InMsgImpl(Context& ctx, void SingularString::InMsgImpl(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
std::string hazzer_thunk = Thunk(ctx, field, "has"); std::string hazzer_thunk = ThunkName(ctx, field, "has");
std::string getter_thunk = Thunk(ctx, field, "get"); std::string getter_thunk = ThunkName(ctx, field, "get");
std::string setter_thunk = Thunk(ctx, field, "set"); std::string setter_thunk = ThunkName(ctx, field, "set");
std::string proxied_type = PrimitiveRsTypeName(field); std::string proxied_type = PrimitiveRsTypeName(field);
auto transform_view = [&] { auto transform_view = [&] {
if (field.type() == FieldDescriptor::TYPE_STRING) { if (field.type() == FieldDescriptor::TYPE_STRING) {
@ -85,7 +85,7 @@ void SingularString::InMsgImpl(Context& ctx,
{"hazzer_thunk", hazzer_thunk}, {"hazzer_thunk", hazzer_thunk},
{"getter_thunk", getter_thunk}, {"getter_thunk", getter_thunk},
{"setter_thunk", setter_thunk}, {"setter_thunk", setter_thunk},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
}, },
R"rs( R"rs(
pub fn $field$_mut(&mut self) -> $pb$::FieldEntry<'_, $proxied_type$> { pub fn $field$_mut(&mut self) -> $pb$::FieldEntry<'_, $proxied_type$> {
@ -153,10 +153,10 @@ void SingularString::InMsgImpl(Context& ctx,
void SingularString::InExternC(Context& ctx, void SingularString::InExternC(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"hazzer_thunk", Thunk(ctx, field, "has")}, ctx.Emit({{"hazzer_thunk", ThunkName(ctx, field, "has")},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"setter_thunk", Thunk(ctx, field, "set")}, {"setter_thunk", ThunkName(ctx, field, "set")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"with_presence_fields_thunks", {"with_presence_fields_thunks",
[&] { [&] {
if (field.has_presence()) { if (field.has_presence()) {
@ -177,10 +177,10 @@ void SingularString::InThunkCc(Context& ctx,
const FieldDescriptor& field) const { const FieldDescriptor& field) const {
ctx.Emit({{"field", cpp::FieldName(&field)}, ctx.Emit({{"field", cpp::FieldName(&field)},
{"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())}, {"QualifiedMsg", cpp::QualifiedClassName(field.containing_type())},
{"hazzer_thunk", Thunk(ctx, field, "has")}, {"hazzer_thunk", ThunkName(ctx, field, "has")},
{"getter_thunk", Thunk(ctx, field, "get")}, {"getter_thunk", ThunkName(ctx, field, "get")},
{"setter_thunk", Thunk(ctx, field, "set")}, {"setter_thunk", ThunkName(ctx, field, "set")},
{"clearer_thunk", Thunk(ctx, field, "clear")}, {"clearer_thunk", ThunkName(ctx, field, "clear")},
{"with_presence_fields_thunks", {"with_presence_fields_thunks",
[&] { [&] {
if (field.has_presence()) { if (field.has_presence()) {

40
src/google/protobuf/compiler/rust/message.cc
Unescape View File

@ -29,13 +29,13 @@ namespace {
void MessageNew(Context& ctx, const Descriptor& msg) { void MessageNew(Context& ctx, const Descriptor& msg) {
switch (ctx.opts().kernel) { switch (ctx.opts().kernel) {
case Kernel::kCpp: case Kernel::kCpp:
ctx.Emit({{"new_thunk", Thunk(ctx, msg, "new")}}, R"rs( ctx.Emit({{"new_thunk", ThunkName(ctx, msg, "new")}}, R"rs(
Self { inner: $pbr$::MessageInner { msg: unsafe { $new_thunk$() } } } Self { inner: $pbr$::MessageInner { msg: unsafe { $new_thunk$() } } }
)rs"); )rs");
return; return;
case Kernel::kUpb: case Kernel::kUpb:
ctx.Emit({{"new_thunk", Thunk(ctx, msg, "new")}}, R"rs( ctx.Emit({{"new_thunk", ThunkName(ctx, msg, "new")}}, R"rs(
let arena = $pbr$::Arena::new(); let arena = $pbr$::Arena::new();
Self { Self {
inner: $pbr$::MessageInner { inner: $pbr$::MessageInner {
@ -53,13 +53,13 @@ void MessageNew(Context& ctx, const Descriptor& msg) {
void MessageSerialize(Context& ctx, const Descriptor& msg) { void MessageSerialize(Context& ctx, const Descriptor& msg) {
switch (ctx.opts().kernel) { switch (ctx.opts().kernel) {
case Kernel::kCpp: case Kernel::kCpp:
ctx.Emit({{"serialize_thunk", Thunk(ctx, msg, "serialize")}}, R"rs( ctx.Emit({{"serialize_thunk", ThunkName(ctx, msg, "serialize")}}, R"rs(
unsafe { $serialize_thunk$(self.inner.msg) } unsafe { $serialize_thunk$(self.inner.msg) }
)rs"); )rs");
return; return;
case Kernel::kUpb: case Kernel::kUpb:
ctx.Emit({{"serialize_thunk", Thunk(ctx, msg, "serialize")}}, R"rs( ctx.Emit({{"serialize_thunk", ThunkName(ctx, msg, "serialize")}}, R"rs(
let arena = $pbr$::Arena::new(); let arena = $pbr$::Arena::new();
let mut len = 0; let mut len = 0;
unsafe { unsafe {
@ -78,7 +78,7 @@ void MessageDeserialize(Context& ctx, const Descriptor& msg) {
case Kernel::kCpp: case Kernel::kCpp:
ctx.Emit( ctx.Emit(
{ {
{"deserialize_thunk", Thunk(ctx, msg, "deserialize")}, {"deserialize_thunk", ThunkName(ctx, msg, "deserialize")},
}, },
R"rs( R"rs(
let success = unsafe { let success = unsafe {
@ -94,7 +94,7 @@ void MessageDeserialize(Context& ctx, const Descriptor& msg) {
return; return;
case Kernel::kUpb: case Kernel::kUpb:
ctx.Emit({{"deserialize_thunk", Thunk(ctx, msg, "parse")}}, R"rs( ctx.Emit({{"deserialize_thunk", ThunkName(ctx, msg, "parse")}}, R"rs(
let arena = $pbr$::Arena::new(); let arena = $pbr$::Arena::new();
let msg = unsafe { let msg = unsafe {
$deserialize_thunk$(data.as_ptr(), data.len(), arena.raw()) $deserialize_thunk$(data.as_ptr(), data.len(), arena.raw())
@ -122,10 +122,10 @@ void MessageExterns(Context& ctx, const Descriptor& msg) {
case Kernel::kCpp: case Kernel::kCpp:
ctx.Emit( ctx.Emit(
{ {
{"new_thunk", Thunk(ctx, msg, "new")}, {"new_thunk", ThunkName(ctx, msg, "new")},
{"delete_thunk", Thunk(ctx, msg, "delete")}, {"delete_thunk", ThunkName(ctx, msg, "delete")},
{"serialize_thunk", Thunk(ctx, msg, "serialize")}, {"serialize_thunk", ThunkName(ctx, msg, "serialize")},
{"deserialize_thunk", Thunk(ctx, msg, "deserialize")}, {"deserialize_thunk", ThunkName(ctx, msg, "deserialize")},
}, },
R"rs( R"rs(
fn $new_thunk$() -> $pbi$::RawMessage; fn $new_thunk$() -> $pbi$::RawMessage;
@ -138,9 +138,9 @@ void MessageExterns(Context& ctx, const Descriptor& msg) {
case Kernel::kUpb: case Kernel::kUpb:
ctx.Emit( ctx.Emit(
{ {
{"new_thunk", Thunk(ctx, msg, "new")}, {"new_thunk", ThunkName(ctx, msg, "new")},
{"serialize_thunk", Thunk(ctx, msg, "serialize")}, {"serialize_thunk", ThunkName(ctx, msg, "serialize")},
{"deserialize_thunk", Thunk(ctx, msg, "parse")}, {"deserialize_thunk", ThunkName(ctx, msg, "parse")},
}, },
R"rs( R"rs(
fn $new_thunk$(arena: $pbi$::RawArena) -> $pbi$::RawMessage; fn $new_thunk$(arena: $pbi$::RawArena) -> $pbi$::RawMessage;
@ -160,7 +160,7 @@ void MessageDrop(Context& ctx, const Descriptor& msg) {
return; return;
} }
ctx.Emit({{"delete_thunk", Thunk(ctx, msg, "delete")}}, R"rs( ctx.Emit({{"delete_thunk", ThunkName(ctx, msg, "delete")}}, R"rs(
unsafe { $delete_thunk$(self.inner.msg); } unsafe { $delete_thunk$(self.inner.msg); }
)rs"); )rs");
} }
@ -173,8 +173,8 @@ void GetterForViewOrMut(Context& ctx, const FieldDescriptor& field,
bool is_mut) { bool is_mut) {
auto fieldName = field.name(); auto fieldName = field.name();
auto fieldType = field.type(); auto fieldType = field.type();
auto getter_thunk = Thunk(ctx, field, "get"); auto getter_thunk = ThunkName(ctx, field, "get");
auto setter_thunk = Thunk(ctx, field, "set"); auto setter_thunk = ThunkName(ctx, field, "set");
// If we're dealing with a Mut, the getter must be supplied // If we're dealing with a Mut, the getter must be supplied
// self.inner.msg() whereas a View has to be supplied self.msg // self.inner.msg() whereas a View has to be supplied self.msg
auto self = is_mut ? "self.inner.msg()" : "self.msg"; auto self = is_mut ? "self.inner.msg()" : "self.msg";
@ -552,10 +552,10 @@ void GenerateThunksCc(Context& ctx, const Descriptor& msg) {
{{"abi", "\"C\""}, // Workaround for syntax highlight bug in VSCode. {{"abi", "\"C\""}, // Workaround for syntax highlight bug in VSCode.
{"Msg", msg.name()}, {"Msg", msg.name()},
{"QualifiedMsg", cpp::QualifiedClassName(&msg)}, {"QualifiedMsg", cpp::QualifiedClassName(&msg)},
{"new_thunk", Thunk(ctx, msg, "new")}, {"new_thunk", ThunkName(ctx, msg, "new")},
{"delete_thunk", Thunk(ctx, msg, "delete")}, {"delete_thunk", ThunkName(ctx, msg, "delete")},
{"serialize_thunk", Thunk(ctx, msg, "serialize")}, {"serialize_thunk", ThunkName(ctx, msg, "serialize")},
{"deserialize_thunk", Thunk(ctx, msg, "deserialize")}, {"deserialize_thunk", ThunkName(ctx, msg, "deserialize")},
{"nested_msg_thunks", {"nested_msg_thunks",
[&] { [&] {
for (int i = 0; i < msg.nested_type_count(); ++i) { for (int i = 0; i < msg.nested_type_count(); ++i) {

29
src/google/protobuf/compiler/rust/naming.cc
Unescape View File

@ -77,8 +77,8 @@ std::string FieldPrefix(Context& ctx, const T& field) {
} }
template <typename T> template <typename T>
std::string Thunk(Context& ctx, const T& field, absl::string_view op) { std::string ThunkName(Context& ctx, const T& field, absl::string_view op) {
std::string thunk = FieldPrefix(ctx, field); std::string thunkName = FieldPrefix(ctx, field);
absl::string_view format; absl::string_view format;
if (ctx.is_upb() && op == "get") { if (ctx.is_upb() && op == "get") {
@ -95,46 +95,47 @@ std::string Thunk(Context& ctx, const T& field, absl::string_view op) {
format = "_$0_$1"; format = "_$0_$1";
} }
absl::SubstituteAndAppend(&thunk, format, op, field.name()); absl::SubstituteAndAppend(&thunkName, format, op, field.name());
return thunk; return thunkName;
} }
std::string ThunkMapOrRepeated(Context& ctx, const FieldDescriptor& field, std::string ThunkMapOrRepeated(Context& ctx, const FieldDescriptor& field,
absl::string_view op) { absl::string_view op) {
if (!ctx.is_upb()) { if (!ctx.is_upb()) {
return Thunk<FieldDescriptor>(ctx, field, op); return ThunkName<FieldDescriptor>(ctx, field, op);
} }
std::string thunk = absl::StrCat("_", FieldPrefix(ctx, field)); std::string thunkName = absl::StrCat("_", FieldPrefix(ctx, field));
absl::string_view format; absl::string_view format;
if (op == "get") { if (op == "get") {
format = field.is_map() ? "_$1_upb_map" : "_$1_upb_array"; format = field.is_map() ? "_$1_upb_map" : "_$1_upb_array";
} else if (op == "get_mut") { } else if (op == "get_mut") {
format = field.is_map() ? "_$1_mutable_upb_map" : "_$1_mutable_upb_array"; format = field.is_map() ? "_$1_mutable_upb_map" : "_$1_mutable_upb_array";
} else { } else {
return Thunk<FieldDescriptor>(ctx, field, op); return ThunkName<FieldDescriptor>(ctx, field, op);
} }
absl::SubstituteAndAppend(&thunk, format, op, field.name()); absl::SubstituteAndAppend(&thunkName, format, op, field.name());
return thunk; return thunkName;
} }
} // namespace } // namespace
std::string Thunk(Context& ctx, const FieldDescriptor& field, std::string ThunkName(Context& ctx, const FieldDescriptor& field,
absl::string_view op) { absl::string_view op) {
if (field.is_map() || field.is_repeated()) { if (field.is_map() || field.is_repeated()) {
return ThunkMapOrRepeated(ctx, field, op); return ThunkMapOrRepeated(ctx, field, op);
} }
return Thunk<FieldDescriptor>(ctx, field, op); return ThunkName<FieldDescriptor>(ctx, field, op);
} }
std::string Thunk(Context& ctx, const OneofDescriptor& field, std::string ThunkName(Context& ctx, const OneofDescriptor& field,
absl::string_view op) { absl::string_view op) {
return Thunk<OneofDescriptor>(ctx, field, op); return ThunkName<OneofDescriptor>(ctx, field, op);
} }
std::string Thunk(Context& ctx, const Descriptor& msg, absl::string_view op) { std::string ThunkName(Context& ctx, const Descriptor& msg,
absl::string_view op) {
absl::string_view prefix = ctx.is_cpp() ? "__rust_proto_thunk__" : ""; absl::string_view prefix = ctx.is_cpp() ? "__rust_proto_thunk__" : "";
return absl::StrCat(prefix, GetUnderscoreDelimitedFullName(ctx, msg), "_", return absl::StrCat(prefix, GetUnderscoreDelimitedFullName(ctx, msg), "_",
op); op);

7
src/google/protobuf/compiler/rust/naming.h
Unescape View File

@ -25,12 +25,13 @@ std::string GetRsFile(Context& ctx, const FileDescriptor& file);
std::string GetThunkCcFile(Context& ctx, const FileDescriptor& file); std::string GetThunkCcFile(Context& ctx, const FileDescriptor& file);
std::string GetHeaderFile(Context& ctx, const FileDescriptor& file); std::string GetHeaderFile(Context& ctx, const FileDescriptor& file);
std::string Thunk(Context& ctx, const FieldDescriptor& field, std::string ThunkName(Context& ctx, const FieldDescriptor& field,
absl::string_view op); absl::string_view op);
std::string Thunk(Context& ctx, const OneofDescriptor& field, std::string ThunkName(Context& ctx, const OneofDescriptor& field,
absl::string_view op); absl::string_view op);
std::string Thunk(Context& ctx, const Descriptor& msg, absl::string_view op); std::string ThunkName(Context& ctx, const Descriptor& msg,
absl::string_view op);
std::string PrimitiveRsTypeName(const FieldDescriptor& field); std::string PrimitiveRsTypeName(const FieldDescriptor& field);

6
src/google/protobuf/compiler/rust/oneof.cc
Unescape View File

@ -319,7 +319,7 @@ void GenerateOneofAccessors(Context& ctx, const OneofDescriptor& oneof) {
)rs"); )rs");
} }
}}, }},
{"case_thunk", Thunk(ctx, oneof, "case")}}, {"case_thunk", ThunkName(ctx, oneof, "case")}},
R"rs( R"rs(
pub fn r#$oneof_name$(&self) -> $Msg$_::$view_enum_name$ { pub fn r#$oneof_name$(&self) -> $Msg$_::$view_enum_name$ {
match unsafe { $case_thunk$(self.inner.msg) } { match unsafe { $case_thunk$(self.inner.msg) } {
@ -342,7 +342,7 @@ void GenerateOneofExternC(Context& ctx, const OneofDescriptor& oneof) {
ctx.Emit( ctx.Emit(
{ {
{"case_enum_rs_name", oneofCaseEnumName(oneof)}, {"case_enum_rs_name", oneofCaseEnumName(oneof)},
{"case_thunk", Thunk(ctx, oneof, "case")}, {"case_thunk", ThunkName(ctx, oneof, "case")},
}, },
R"rs( R"rs(
fn $case_thunk$(raw_msg: $pbi$::RawMessage) -> $Msg$_::$case_enum_rs_name$; fn $case_thunk$(raw_msg: $pbi$::RawMessage) -> $Msg$_::$case_enum_rs_name$;
@ -354,7 +354,7 @@ void GenerateOneofThunkCc(Context& ctx, const OneofDescriptor& oneof) {
{ {
{"oneof_name", oneof.name()}, {"oneof_name", oneof.name()},
{"case_enum_name", oneofCaseEnumName(oneof)}, {"case_enum_name", oneofCaseEnumName(oneof)},
{"case_thunk", Thunk(ctx, oneof, "case")}, {"case_thunk", ThunkName(ctx, oneof, "case")},
{"QualifiedMsg", cpp::QualifiedClassName(oneof.containing_type())}, {"QualifiedMsg", cpp::QualifiedClassName(oneof.containing_type())},
}, },
R"cc( R"cc(

Write Preview
Loading…
Cancel
Save