From 6f778d8d53477f655ef4ac89858fdac73dda719c Mon Sep 17 00:00:00 2001
From: Hong Shin <hongshin@google.com>
Date: Wed, 2 Aug 2023 09:18:58 -0700
Subject: [PATCH] Refactor std::marker::PhantomData to $phantom$

PiperOrigin-RevId: 553165873
---
 src/google/protobuf/compiler/rust/generator.cc | 1 +
 src/google/protobuf/compiler/rust/message.cc   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/google/protobuf/compiler/rust/generator.cc b/src/google/protobuf/compiler/rust/generator.cc
index a659124bb9..02a92a6dc7 100644
--- a/src/google/protobuf/compiler/rust/generator.cc
+++ b/src/google/protobuf/compiler/rust/generator.cc
@@ -238,6 +238,7 @@ bool RustGenerator::Generate(const FileDescriptor* file_desc,
       {"pbi", "::__pb::__internal"},
       {"pbr", "::__pb::__runtime"},
       {"NonNull", "::__std::ptr::NonNull"},
+      {"Phantom", "::__std::marker::PhantomData"},
   });
 
   file.Emit({{"kernel", KernelRsName(file.opts().kernel)}}, R"rs(
diff --git a/src/google/protobuf/compiler/rust/message.cc b/src/google/protobuf/compiler/rust/message.cc
index 24bbd88c06..2cd69f4940 100644
--- a/src/google/protobuf/compiler/rust/message.cc
+++ b/src/google/protobuf/compiler/rust/message.cc
@@ -303,7 +303,7 @@ void MessageGenerator::GenerateRs(Context<Descriptor> msg) {
         #[derive(Debug, Copy, Clone)]
         pub struct $Msg$View<'a> {
           _msg: $pbi$::RawMessage,
-          _phantom: std::marker::PhantomData<&'a ()>,
+          _phantom: $Phantom$<&'a ()>,
         }
 
         impl<'a> $pb$::ViewProxy<'a> for $Msg$View<'a> {
@@ -323,7 +323,7 @@ void MessageGenerator::GenerateRs(Context<Descriptor> msg) {
 
         #[derive(Debug)]
         pub struct $Msg$Mut<'a> {
-          _phantom: std::marker::PhantomData<&'a mut ()>,
+          _phantom: $Phantom$<&'a mut ()>,
         }
 
         impl<'a> $pb$::MutProxy<'a> for $Msg$Mut<'a> {