Skip to content

Commit 8d36600

Browse files
Fix lowerCamelCase to UpperCamelCase (per Cpp style guide)
PiperOrigin-RevId: 595753465
1 parent fbbe681 commit 8d36600

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/google/protobuf/compiler/rust/enum.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ namespace rust {
3535

3636
namespace {
3737

38-
std::string enumName(const EnumDescriptor& desc) {
38+
std::string EnumName(const EnumDescriptor& desc) {
3939
return cpp::UnderscoresToCamelCase(desc.name(), /*cap first letter=*/true);
4040
}
4141

4242
// Constructs input for `EnumValues` from an enum descriptor.
43-
std::vector<std::pair<absl::string_view, int32_t>> enumValuesInput(
43+
std::vector<std::pair<absl::string_view, int32_t>> EnumValuesInput(
4444
const EnumDescriptor& desc) {
4545
std::vector<std::pair<absl::string_view, int32_t>> result;
4646
result.reserve(static_cast<size_t>(desc.value_count()));
@@ -165,10 +165,10 @@ std::string ScreamingSnakeToUpperCamelCase(absl::string_view input) {
165165
}
166166

167167
void GenerateEnumDefinition(Context& ctx, const EnumDescriptor& desc) {
168-
std::string name = enumName(desc);
168+
std::string name = EnumName(desc);
169169
ABSL_CHECK(desc.value_count() > 0);
170170
std::vector<RustEnumValue> values =
171-
EnumValues(desc.name(), enumValuesInput(desc));
171+
EnumValues(desc.name(), EnumValuesInput(desc));
172172
ABSL_CHECK(!values.empty());
173173

174174
ctx.Emit(

src/google/protobuf/compiler/rust/oneof.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ std::string ToCamelCase(absl::string_view name) {
7878
return cpp::UnderscoresToCamelCase(name, /* upper initial letter */ true);
7979
}
8080

81-
std::string oneofViewEnumRsName(const OneofDescriptor& oneof) {
81+
std::string OneofViewEnumRsName(const OneofDescriptor& oneof) {
8282
return ToCamelCase(oneof.name());
8383
}
8484

85-
std::string oneofMutEnumRsName(const OneofDescriptor& oneof) {
85+
std::string OneofMutEnumRsName(const OneofDescriptor& oneof) {
8686
return ToCamelCase(oneof.name()) + "Mut";
8787
}
8888

89-
std::string oneofCaseEnumName(const OneofDescriptor& oneof) {
89+
std::string OneofCaseEnumName(const OneofDescriptor& oneof) {
9090
// Note: This is the name used for the cpp Case enum, we use it for both
9191
// the Rust Case enum as well as for the cpp case enum in the cpp thunk.
9292
return ToCamelCase(oneof.name()) + "Case";
@@ -167,8 +167,8 @@ std::string RsTypeNameMut(Context& ctx, const FieldDescriptor& field) {
167167

168168
void GenerateOneofDefinition(Context& ctx, const OneofDescriptor& oneof) {
169169
ctx.Emit(
170-
{{"view_enum_name", oneofViewEnumRsName(oneof)},
171-
{"mut_enum_name", oneofMutEnumRsName(oneof)},
170+
{{"view_enum_name", OneofViewEnumRsName(oneof)},
171+
{"mut_enum_name", OneofMutEnumRsName(oneof)},
172172
{"view_fields",
173173
[&] {
174174
for (int i = 0; i < oneof.field_count(); ++i) {
@@ -230,7 +230,7 @@ void GenerateOneofDefinition(Context& ctx, const OneofDescriptor& oneof) {
230230

231231
// Note: This enum is used as the Thunk return type for getting which case is
232232
// used: it exactly matches the generate case enum that both cpp and upb use.
233-
ctx.Emit({{"case_enum_name", oneofCaseEnumName(oneof)},
233+
ctx.Emit({{"case_enum_name", OneofCaseEnumName(oneof)},
234234
{"cases",
235235
[&] {
236236
for (int i = 0; i < oneof.field_count(); ++i) {
@@ -258,9 +258,9 @@ void GenerateOneofDefinition(Context& ctx, const OneofDescriptor& oneof) {
258258
void GenerateOneofAccessors(Context& ctx, const OneofDescriptor& oneof) {
259259
ctx.Emit(
260260
{{"oneof_name", oneof.name()},
261-
{"view_enum_name", oneofViewEnumRsName(oneof)},
262-
{"mut_enum_name", oneofMutEnumRsName(oneof)},
263-
{"case_enum_name", oneofCaseEnumName(oneof)},
261+
{"view_enum_name", OneofViewEnumRsName(oneof)},
262+
{"mut_enum_name", OneofMutEnumRsName(oneof)},
263+
{"case_enum_name", OneofCaseEnumName(oneof)},
264264
{"view_cases",
265265
[&] {
266266
for (int i = 0; i < oneof.field_count(); ++i) {
@@ -341,7 +341,7 @@ void GenerateOneofAccessors(Context& ctx, const OneofDescriptor& oneof) {
341341
void GenerateOneofExternC(Context& ctx, const OneofDescriptor& oneof) {
342342
ctx.Emit(
343343
{
344-
{"case_enum_rs_name", oneofCaseEnumName(oneof)},
344+
{"case_enum_rs_name", OneofCaseEnumName(oneof)},
345345
{"case_thunk", ThunkName(ctx, oneof, "case")},
346346
},
347347
R"rs(
@@ -353,7 +353,7 @@ void GenerateOneofThunkCc(Context& ctx, const OneofDescriptor& oneof) {
353353
ctx.Emit(
354354
{
355355
{"oneof_name", oneof.name()},
356-
{"case_enum_name", oneofCaseEnumName(oneof)},
356+
{"case_enum_name", OneofCaseEnumName(oneof)},
357357
{"case_thunk", ThunkName(ctx, oneof, "case")},
358358
{"QualifiedMsg", cpp::QualifiedClassName(oneof.containing_type())},
359359
},

0 commit comments

Comments
 (0)