Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions rust/codegen_traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ impl<T: EntityType<Tag = entity_tag::MessageTag>> MessageTypeHelper<entity_tag::
pub trait MessageType {}
impl<T> MessageType for T where T: EntityType + MessageTypeHelper<T::Tag> {}

/// Provides compile-time access to a generated message's protobuf full name.
///
/// This exists for generic code that needs to name message types without going
/// through runtime reflection or descriptor APIs.
///
/// Bring `protobuf::MessageFullName` into scope to use `MyMessage::FULL_NAME`.
/// Without the trait in scope, use `<MyMessage as protobuf::MessageFullName>::FULL_NAME`.
pub trait MessageFullName: MessageType {
/// The protobuf full name for the generated message type.
const FULL_NAME: &'static str;
}

/// A trait that all generated owned message types implement.
pub trait Message: SealedInternal
+ EntityType<Tag = entity_tag::MessageTag>
Expand Down
2 changes: 1 addition & 1 deletion rust/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub use crate::codegen_traits::{
create::Parse,
read::Serialize,
write::{Clear, ClearAndParse, CopyFrom, MergeFrom, TakeFrom},
Message, MessageMut, MessageType, MessageView,
Message, MessageFullName, MessageMut, MessageType, MessageView,
};
pub use crate::cord::{ProtoBytesCow, ProtoStringCow};
pub use crate::extension::ExtensionId;
Expand Down
28 changes: 28 additions & 0 deletions rust/test/shared/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,34 @@ rust_test(
],
)

rust_test(
name = "full_name_cpp_test",
srcs = ["full_name_test.rs"],
aliases = {
"//rust:protobuf_cpp_export": "protobuf",
},
rustc_flags = ["--cfg=bzl"],
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)

rust_test(
name = "full_name_upb_test",
srcs = ["full_name_test.rs"],
aliases = {
"//rust:protobuf_upb_export": "protobuf",
},
rustc_flags = ["--cfg=bzl"],
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)

rust_test(
name = "enum_cpp_test",
srcs = ["enum_test.rs"],
Expand Down
59 changes: 59 additions & 0 deletions rust/test/shared/full_name_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2026 Google LLC. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd

use googletest::prelude::*;
use protobuf::MessageFullName;
use unittest_rust_proto::{test_all_types, NestedTestAllTypes, TestAllTypes};

#[gtest]
fn generated_messages_expose_full_name_via_concrete_syntax() {
assert_that!(TestAllTypes::FULL_NAME, eq("rust_unittest.TestAllTypes"));
assert_that!(
NestedTestAllTypes::FULL_NAME,
eq("rust_unittest.NestedTestAllTypes")
);
assert_that!(
test_all_types::NestedMessage::FULL_NAME,
eq("rust_unittest.TestAllTypes.NestedMessage")
);
}

fn generic_message_full_name<T: MessageFullName>() -> &'static str {
T::FULL_NAME
}

#[gtest]
fn generated_messages_expose_full_name_via_generic_trait() {
assert_that!(
generic_message_full_name::<TestAllTypes>(),
eq("rust_unittest.TestAllTypes")
);
assert_that!(
generic_message_full_name::<NestedTestAllTypes>(),
eq("rust_unittest.NestedTestAllTypes")
);
assert_that!(
generic_message_full_name::<test_all_types::NestedMessage>(),
eq("rust_unittest.TestAllTypes.NestedMessage")
);
}

#[gtest]
fn generated_messages_expose_full_name_via_ufcs() {
assert_that!(
<TestAllTypes as MessageFullName>::FULL_NAME,
eq(TestAllTypes::FULL_NAME)
);
assert_that!(
<NestedTestAllTypes as MessageFullName>::FULL_NAME,
eq(NestedTestAllTypes::FULL_NAME)
);
assert_that!(
<test_all_types::NestedMessage as MessageFullName>::FULL_NAME,
eq(test_all_types::NestedMessage::FULL_NAME)
);
}
5 changes: 5 additions & 0 deletions src/google/protobuf/compiler/rust/message.cc
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ void GenerateRs(Context& ctx, const Descriptor& msg, const upb::DefPool& pool) {
CppGeneratedMessageTraitImpls(ctx, msg);
}
}},
{"full_name", msg.full_name()},
{"type_conversions_impl", [&] { TypeConversions(ctx, msg); }},
{"unwrap_upb",
[&] {
Expand Down Expand Up @@ -763,6 +764,10 @@ void GenerateRs(Context& ctx, const Descriptor& msg, const upb::DefPool& pool) {
}
}

impl $pb$::MessageFullName for $Msg$ {
const FULL_NAME: &'static str = "$full_name$";
}

impl $pb$::AsView for $Msg$ {
type Proxied = Self;
fn as_view(&self) -> $Msg$View<'_> {
Expand Down
Loading