Fix mismatched_lifetime_syntaxes errors

Fixes #23057.

PiperOrigin-RevId: 792657577

Author: Adam Cozzette

rust/map.rs

@@ -44,7 +44,7 @@ pub struct MapMut<'msg, K: ?Sized, V: ?Sized> {
 }
 
 impl<'msg, K: ?Sized, V: ?Sized> MapMut<'msg, K, V> {
-    pub fn inner(&self, _private: Private) -> InnerMapMut {
+    pub fn inner(&self, _private: Private) -> InnerMapMut<'_> {
         self.inner
     }
 }
@@ -346,14 +346,14 @@ where
         V::map_clear(self.as_mut())
     }
 
-    pub fn get<'a>(&self, key: impl Into<View<'a, K>>) -> Option<View<V>>
+    pub fn get<'a>(&self, key: impl Into<View<'a, K>>) -> Option<View<'_, V>>
     where
         K: 'a,
     {
         V::map_get(self.as_view(), key.into())
     }
 
-    pub fn get_mut<'a>(&mut self, key: impl Into<View<'a, K>>) -> Option<Mut<V>>
+    pub fn get_mut<'a>(&mut self, key: impl Into<View<'a, K>>) -> Option<Mut<'_, V>>
     where
         K: 'a,
         V: Message,
@@ -377,7 +377,7 @@ where
     /// Returns an iterator visiting all key-value pairs in arbitrary order.
     ///
     /// The iterator element type is `(View<K>, View<V>)`.
-    pub fn iter(&self) -> MapIter<K, V> {
+    pub fn iter(&self) -> MapIter<'_, K, V> {
         self.into_iter()
     }
 

rust/release_crates/cargo_test.sh

@@ -77,6 +77,8 @@ tar -xvf $WELL_KNOWN_TYPES_TAR -C $WELL_KNOWN_TYPES_ROOT
 # Put the Bazel-built protoc at the beginning of $PATH
 PATH=$(dirname $(rlocation com_google_protobuf/protoc)):$PATH
 
+export RUSTFLAGS="-Dmismatched-lifetime-syntaxes"
+
 cd $CRATE_ROOT
 CARGO_HOME=$CARGO_HOME cargo test
 CARGO_HOME=$CARGO_HOME cargo publish --dry-run

rust/repeated.rs

@@ -159,7 +159,7 @@ where
     ///
     /// Returns `None` if `index >= len`.
     #[inline]
-    pub fn get(&self, index: usize) -> Option<View<T>> {
+    pub fn get(&self, index: usize) -> Option<View<'_, T>> {
         self.as_view().get(index)
     }
 
@@ -198,7 +198,7 @@ where
     /// # Safety
     /// Undefined behavior if `index >= len`.
     #[inline]
-    pub unsafe fn get_unchecked(&self, index: usize) -> View<T> {
+    pub unsafe fn get_unchecked(&self, index: usize) -> View<'_, T> {
         // SAFETY: in-bounds as promised
         unsafe { self.as_view().get_unchecked(index) }
     }
@@ -232,7 +232,7 @@ where
     }
 
     /// Iterates over the values in the repeated field.
-    pub fn iter(&self) -> RepeatedIter<T> {
+    pub fn iter(&self) -> RepeatedIter<'_, T> {
         self.as_view().into_iter()
     }
 
@@ -251,7 +251,7 @@ impl<T> Repeated<T>
 where
     T: ProxiedInRepeated,
 {
-    pub fn as_view(&self) -> View<Repeated<T>> {
+    pub fn as_view(&self) -> View<'_, Repeated<T>> {
         RepeatedView { raw: self.inner.raw(), _phantom: PhantomData }
     }
 

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

@@ -1009,13 +1009,13 @@ void GenerateRs(Context& ctx, const Descriptor& msg, const upb::DefPool& pool) {
             $pb$::ClearAndParse::clear_and_parse_dont_enforce_required(&mut msg, data).map(|_| msg)
           }
 
-          pub fn as_view(&self) -> $Msg$View {
+          pub fn as_view(&self) -> $Msg$View<'_> {
             $Msg$View::new(
                 $pbi$::Private,
                 $pbr$::MessageViewInner::view_of_owned(&self.inner))
           }
 
-          pub fn as_mut(&mut self) -> $Msg$Mut {
+          pub fn as_mut(&mut self) -> $Msg$Mut<'_> {
             let inner = $pbr$::MessageMutInner::mut_of_owned(&mut self.inner);
             $Msg$Mut::new($pbi$::Private, inner)
           }
@@ -1039,14 +1039,14 @@ void GenerateRs(Context& ctx, const Descriptor& msg, const upb::DefPool& pool) {
 
         impl $pb$::AsView for $Msg$ {
           type Proxied = Self;
-          fn as_view(&self) -> $Msg$View {
+          fn as_view(&self) -> $Msg$View<'_> {
             self.as_view()
           }
         }
 
         impl $pb$::AsMut for $Msg$ {
           type MutProxied = Self;
-          fn as_mut(&mut self) -> $Msg$Mut {
+          fn as_mut(&mut self) -> $Msg$Mut<'_> {
             self.as_mut()
           }
         }