Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement _mut() accessors for messages without FieldEntry #16629

Merged
merged 1 commit into from Apr 29, 2024
Merged

Implement _mut() accessors for messages without FieldEntry #16629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 20 additions & 26 deletions src/google/protobuf/compiler/rust/accessors/singular_message.cc
View file
Open in desktop
Expand Up @@ -69,39 +69,34 @@ void SingularMessage::InMsgImpl(Context& ctx, const FieldDescriptor& field,
}
)rs");
}},
{"getter_mut",
{"getter_mut_body",
[&] {
if (accessor_case == AccessorCase::VIEW) {
return;
}
ctx.Emit({}, R"rs(
pub fn $raw_field_name$_mut(&mut self) -> $msg_type$Mut<'_> {
self.$raw_field_name$_entry().or_default()
}
if (ctx.is_cpp()) {
ctx.Emit({}, R"rs(
let raw_msg = unsafe { $getter_mut_thunk$(self.raw_msg()) };
$msg_type$Mut::from_parent($pbi$::Private,
self.as_mutator_message_ref($pbi$::Private), raw_msg)
)rs");
} else {
ctx.Emit({}, R"rs(
let raw_msg = unsafe {
$getter_mut_thunk$(self.raw_msg(), self.arena().raw())
};
$msg_type$Mut::from_parent($pbi$::Private,
self.as_mutator_message_ref($pbi$::Private), raw_msg)
)rs");
}
}},
{"private_getter_entry",
{"getter_mut",
[&] {
if (accessor_case == AccessorCase::VIEW) {
return;
}

ctx.Emit({}, R"rs(
fn $raw_field_name$_entry(&mut self)
-> $pb$::FieldEntry<'_, $msg_type$> {
static VTABLE: $pbr$::MessageVTable =
$pbr$::MessageVTable::new($pbi$::Private,
$getter_thunk$,
$getter_mut_thunk$,
$clearer_thunk$);
unsafe {
let has = self.has_$raw_field_name$();
$pbi$::new_vtable_field_entry($pbi$::Private,
self.as_mutator_message_ref($pbi$::Private),
&VTABLE,
has)
}
}
)rs");
pub fn $raw_field_name$_mut(&mut self) -> $msg_type$Mut<'_> {
$getter_mut_body$
})rs");
}},
{"getter_opt",
[&] {
Expand Down Expand Up @@ -172,7 +167,6 @@ void SingularMessage::InMsgImpl(Context& ctx, const FieldDescriptor& field,
R"rs(
$getter$
$getter_mut$
$private_getter_entry$
$getter_opt$
$setter$
$hazzer$
Expand Down