Address new lifetime errors in Rust 1.89 (#3620)

Author: kennykerr

crates/libs/metadata/src/reader/blob.rs

@@ -61,7 +61,7 @@ impl<'a> Blob<'a> {
         }
     }
 
-    pub fn read_modifiers(&mut self) -> Vec<TypeDefOrRef> {
+    pub fn read_modifiers(&mut self) -> Vec<TypeDefOrRef<'a>> {
         let mut mods = vec![];
         loop {
             let (value, offset) = self.peek();

crates/libs/metadata/src/reader/codes.rs

@@ -42,8 +42,8 @@ code! { AttributeType(3)
     (MemberRef, 3)
 }
 
-impl AttributeType<'_> {
-    pub fn parent(&self) -> MemberRefParent {
+impl<'a> AttributeType<'a> {
+    pub fn parent(&self) -> MemberRefParent<'a> {
         match self {
             Self::MethodDef(row) => row.parent(),
             Self::MemberRef(row) => row.parent(),

crates/libs/metadata/src/reader/item_index.rs

@@ -42,7 +42,7 @@ impl<'a> ItemIndex<'a> {
         Self(members)
     }
 
-    pub fn iter(&self) -> impl Iterator<Item = (&str, &str, &Item)> + '_ {
+    pub fn iter(&self) -> impl Iterator<Item = (&str, &str, &Item<'_>)> + '_ {
         self.0
             .iter()
             .flat_map(|(namespace, items)| {
@@ -55,11 +55,11 @@ impl<'a> ItemIndex<'a> {
             })
     }
 
-    pub fn items(&self) -> impl Iterator<Item = &Item> + '_ {
+    pub fn items(&self) -> impl Iterator<Item = &Item<'_>> + '_ {
         self.0.values().flat_map(|items| items.values()).flatten()
     }
 
-    pub fn get(&self, namespace: &str, name: &str) -> impl Iterator<Item = &Item> + '_ {
+    pub fn get(&self, namespace: &str, name: &str) -> impl Iterator<Item = &Item<'_>> + '_ {
         self.0
             .get(namespace)
             .and_then(|items| items.get(name))
@@ -68,7 +68,7 @@ impl<'a> ItemIndex<'a> {
     }
 
     #[track_caller]
-    pub fn expect(&self, namespace: &str, name: &str) -> &Item {
+    pub fn expect(&self, namespace: &str, name: &str) -> &Item<'_> {
         let mut iter = self.get(namespace, name);
 
         if let Some(item) = iter.next() {

crates/libs/metadata/src/reader/row.rs

@@ -117,7 +117,7 @@ pub trait AsRow<'a>: Copy {
         )
     }
 
-    fn parent_row<P: AsRow<'a>>(&'a self, column: usize) -> P {
+    fn parent_row<P: AsRow<'a>>(&self, column: usize) -> P {
         let row = self.to_row();
 
         P::from_row(Row::new(

crates/libs/metadata/src/reader/tables/attribute.rs

@@ -8,12 +8,12 @@ impl std::fmt::Debug for Attribute<'_> {
     }
 }
 
-impl Attribute<'_> {
-    pub fn parent(&self) -> HasAttribute {
+impl<'a> Attribute<'a> {
+    pub fn parent(&self) -> HasAttribute<'a> {
         self.decode(0)
     }
 
-    pub fn ctor(&self) -> AttributeType {
+    pub fn ctor(&self) -> AttributeType<'a> {
         self.decode(1)
     }
 

crates/libs/metadata/src/reader/tables/constant.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-impl Constant<'_> {
+impl<'a> Constant<'a> {
     pub fn ty(&self) -> Type {
         match self.usize(0).try_into().unwrap() {
             ELEMENT_TYPE_U1 => Type::U8,
@@ -18,7 +18,7 @@ impl Constant<'_> {
         }
     }
 
-    pub fn parent(&self) -> HasConstant {
+    pub fn parent(&self) -> HasConstant<'a> {
         self.decode(1)
     }
 

crates/libs/metadata/src/reader/tables/field.rs

@@ -23,7 +23,7 @@ impl<'a> Field<'a> {
         blob.read_type_signature(&[])
     }
 
-    pub fn constant(&self) -> Option<Constant> {
+    pub fn constant(&self) -> Option<Constant<'a>> {
         self.equal_range(1, HasConstant::Field(*self).encode())
             .next()
     }

crates/libs/metadata/src/reader/tables/generic_param.rs

@@ -6,7 +6,7 @@ impl std::fmt::Debug for GenericParam<'_> {
     }
 }
 
-impl GenericParam<'_> {
+impl<'a> GenericParam<'a> {
     pub fn sequence(&self) -> u16 {
         self.usize(0).try_into().unwrap()
     }
@@ -15,7 +15,7 @@ impl GenericParam<'_> {
         GenericParamAttributes(self.usize(1).try_into().unwrap())
     }
 
-    pub fn owner(&self) -> TypeOrMethodDef {
+    pub fn owner(&self) -> TypeOrMethodDef<'a> {
         self.decode(2)
     }
 

crates/libs/metadata/src/reader/tables/impl_map.rs

@@ -6,7 +6,7 @@ impl std::fmt::Debug for ImplMap<'_> {
     }
 }
 
-impl ImplMap<'_> {
+impl<'a> ImplMap<'a> {
     pub fn flags(&self) -> PInvokeAttributes {
         PInvokeAttributes(self.usize(0).try_into().unwrap())
     }
@@ -15,7 +15,7 @@ impl ImplMap<'_> {
         self.str(2)
     }
 
-    pub fn import_scope(&self) -> ModuleRef {
+    pub fn import_scope(&self) -> ModuleRef<'a> {
         self.row(3)
     }
 }

crates/libs/metadata/src/reader/tables/interface_impl.rs

@@ -6,8 +6,8 @@ impl std::fmt::Debug for InterfaceImpl<'_> {
     }
 }
 
-impl InterfaceImpl<'_> {
-    pub fn class(&self) -> TypeDef {
+impl<'a> InterfaceImpl<'a> {
+    pub fn class(&self) -> TypeDef<'a> {
         self.row(0)
     }