Merge branch 'main' into protoc_wrapper_argfile

proto/prost/private/protoc_wrapper.rs

@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use std::process;
 use std::{env, fmt};
 
-use heck::ToSnakeCase;
+use heck::{ToSnakeCase, ToUpperCamelCase};
 use prost::Message;
 use prost_types::{
     DescriptorProto, EnumDescriptorProto, FileDescriptorProto, FileDescriptorSet,
@@ -352,7 +352,7 @@ fn message_type_to_extern_paths(
 
     extern_paths.insert(
         proto_path.join(message_type_name),
-        rust_path.join(message_type_name),
+        rust_path.join(&message_type_name.to_upper_camel_case()),
     );
 
     let name_lower = message_type_name.to_lowercase();

proto/prost/private/tests/camel_case/BUILD.bazel

@@ -0,0 +1,37 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("//proto/prost:defs.bzl", "rust_prost_library")
+load("//rust:defs.bzl", "rust_test")
+
+package(default_visibility = ["//proto/prost/private/tests:__subpackages__"])
+
+proto_library(
+    name = "camel_case_proto",
+    srcs = [
+        "camel_case.proto",
+    ],
+    strip_import_prefix = "/proto/prost/private/tests/camel_case",
+)
+
+proto_library(
+    name = "another_proto",
+    srcs = [
+        "another.proto",
+    ],
+    deps = [
+        ":camel_case_proto",
+    ],
+)
+
+rust_prost_library(
+    name = "another_proto_rust",
+    proto = ":another_proto",
+)
+
+rust_test(
+    name = "camel_case_test",
+    srcs = ["camel_case_test.rs"],
+    edition = "2021",
+    deps = [
+        ":another_proto_rust",
+    ],
+)

proto/prost/private/tests/camel_case/another.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package another;
+
+import "camel_case.proto";
+
+message Another {
+    camel_case.NameWithCAPS inner = 1;
+}

proto/prost/private/tests/camel_case/camel_case.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package camel_case;
+
+message NameWithCAPS {
+    string name = 1;
+}

proto/prost/private/tests/camel_case/camel_case_test.rs

@@ -0,0 +1,8 @@
+//! Tests that strange casings of message names are handled correctly.
+
+use another_proto::another::Another;
+
+#[test]
+fn test_nested_messages() {
+    let _a = Another::default();
+}