Internal changes

PiperOrigin-RevId: 652892331

editions/codegen_tests/BUILD

@@ -1,7 +1,7 @@
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 
 exports_files(
-    glob(["*.proto"]) + ["rust_bazel_crate_mapping.txt"],
+    glob(["*.proto"]),
     visibility = [
         "//editions:__pkg__",
     ],

editions/codegen_tests/rust_bazel_crate_mapping.txt

@@ -1,27 +0,0 @@
-proto3_implicit_proto
-1
-third_party/protobuf/editions/codegen_tests/proto3_implicit.proto
-proto2_optional_proto
-1
-third_party/protobuf/editions/codegen_tests/proto2_optional.proto
-proto3_enum_proto
-1
-third_party/protobuf/editions/codegen_tests/proto3_enum.proto
-struct
-1
-google/protobuf/struct.proto
-wrappers
-1
-google/protobuf/wrappers.proto
-duration
-1
-google/protobuf/duration.proto
-timestamp
-1
-google/protobuf/timestamp.proto
-field_mask
-1
-google/protobuf/field_mask.proto
-any
-1
-google/protobuf/any.proto

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

@@ -71,6 +71,13 @@ absl::StatusOr<Options> Options::Parse(absl::string_view param) {
     opts.mapping_file_path = mapping_arg->second;
   }
 
+  auto strip_nonfunctional_codegen_arg = absl::c_find_if(args, [](auto& arg) {
+    return arg.first == "experimental_strip_nonfunctional_codegen";
+  });
+  if (strip_nonfunctional_codegen_arg != args.end()) {
+    opts.strip_nonfunctional_codegen = true;
+  }
+
   return opts;
 }
 

src/google/protobuf/compiler/rust/context.h

@@ -46,6 +46,7 @@ inline absl::string_view KernelRsName(Kernel kernel) {
 struct Options {
   Kernel kernel;
   std::string mapping_file_path;
+  bool strip_nonfunctional_codegen = false;
 
   static absl::StatusOr<Options> Parse(absl::string_view param);
 };
@@ -69,20 +70,12 @@ class RustGeneratorContext {
                      &f) != files_in_current_crate_.end();
   }
 
-  absl::string_view ImportPathToCrateName(absl::string_view import_path) const {
-    auto it = import_path_to_crate_name_.find(import_path);
-    if (it == import_path_to_crate_name_.end()) {
-      ABSL_LOG(FATAL) << "Path " << import_path
-                      << " not found in crate mapping. Crate mapping has "
-                      << import_path_to_crate_name_.size() << " entries";
-    }
-    return it->second;
-  }
-
  private:
   const std::vector<const FileDescriptor*>& files_in_current_crate_;
   const absl::flat_hash_map<std::string, std::string>&
       import_path_to_crate_name_;
+
+  friend class Context;
 };
 
 // A context for generating a particular kind of definition.
@@ -127,6 +120,22 @@ class Context {
     printer_->Emit(vars, format, loc);
   }
 
+  absl::string_view ImportPathToCrateName(absl::string_view import_path) const {
+    if (opts_->strip_nonfunctional_codegen) {
+      return "test";
+    }
+    auto it =
+        rust_generator_context_->import_path_to_crate_name_.find(import_path);
+    if (it == rust_generator_context_->import_path_to_crate_name_.end()) {
+      ABSL_LOG(FATAL)
+          << "Path " << import_path
+          << " not found in crate mapping. Crate mapping has "
+          << rust_generator_context_->import_path_to_crate_name_.size()
+          << " entries";
+    }
+    return it->second;
+  }
+
  private:
   const Options* opts_;
   const RustGeneratorContext* rust_generator_context_;

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

@@ -37,7 +37,7 @@ namespace compiler {
 namespace rust {
 
 std::string GetCrateName(Context& ctx, const FileDescriptor& dep) {
-  return RsSafeName(ctx.generator_context().ImportPathToCrateName(dep.name()));
+  return RsSafeName(ctx.ImportPathToCrateName(dep.name()));
 }
 
 std::string GetRsFile(Context& ctx, const FileDescriptor& file) {