Resolve 'hiding a lifetime' warnings from Rust 1.89

Author: SpaceManiac

crates/dm-langserver/src/debugger/extools.rs

@@ -197,7 +197,7 @@ impl Extools {
         (extools, thread)
     }
 
-    pub fn get_all_threads(&self) -> std::sync::MutexGuard<HashMap<i64, ThreadInfo>> {
+    pub fn get_all_threads(&self) -> std::sync::MutexGuard<'_, HashMap<i64, ThreadInfo>> {
         self.threads.lock().unwrap()
     }
 

crates/dm-langserver/src/main.rs

@@ -683,7 +683,7 @@ impl Engine {
         })
     }
 
-    fn find_type_context<'b, I, Ign>(&self, iter: &I) -> (Option<TypeRef>, Option<(&'b str, usize)>)
+    fn find_type_context<'b, I, Ign>(&self, iter: &I) -> (Option<TypeRef<'_>>, Option<(&'b str, usize)>)
     where
         I: Iterator<Item = (Ign, &'b Annotation)> + Clone,
     {

crates/dmm-tools/src/dmm.rs

@@ -218,7 +218,7 @@ impl Map {
     }
 
     #[inline]
-    pub fn z_level(&self, z: usize) -> ZLevel {
+    pub fn z_level(&self, z: usize) -> ZLevel<'_> {
         ZLevel { grid: self.grid.index_axis(Axis(0), z) }
     }
 

crates/dreamchecker/src/lib.rs

@@ -175,7 +175,7 @@ impl<'o> AssumptionSet<'o> {
         assumption_set![Assumption::Truthy(true), Assumption::IsNull(false), Assumption::IsType(true, ty)]
     }
 
-    fn conflicts_with(&self, new: &Assumption) -> Option<&Assumption> {
+    fn conflicts_with(&self, new: &Assumption) -> Option<&Assumption<'_>> {
         self.set.iter().find(|&each| each.oneway_conflict(new) || new.oneway_conflict(each))
     }
 }
@@ -1455,7 +1455,7 @@ impl<'o, 's> AnalyzeProc<'o, 's> {
                             }
                         }
                         StaticType::Proc => {
-                            error(location, format!("iterating over a procpath which cannot be iterated"))
+                            error(location, "iterating over a procpath which cannot be iterated".to_string())
                                 .register(self.context);
                         }
                     }
@@ -1613,7 +1613,7 @@ impl<'o, 's> AnalyzeProc<'o, 's> {
                             }
                         }
                         StaticType::Proc => {
-                            error(location, format!("iterating over a procpath which cannot be iterated"))
+                            error(location, "iterating over a procpath which cannot be iterated".to_string())
                                 .register(self.context);
                         }
                     }

crates/dreammaker/src/annotation.rs

@@ -85,19 +85,19 @@ impl AnnotationTree {
         self.len == 0
     }
 
-    pub fn iter(&self) -> Iter {
+    pub fn iter(&self) -> Iter<'_> {
         self.tree.iter()
     }
 
-    pub fn get_location(&self, loc: Location) -> Iter {
+    pub fn get_location(&self, loc: Location) -> Iter<'_> {
         self.tree.range(range(loc.pred(), loc))
     }
 
-    pub fn get_range(&self, place: std::ops::Range<Location>) -> Iter {
+    pub fn get_range(&self, place: std::ops::Range<Location>) -> Iter<'_> {
         self.tree.range(range(place.start, place.end.pred()))
     }
 
-    pub fn get_range_raw(&self, place: RangeInclusive<Location>) -> Iter {
+    pub fn get_range_raw(&self, place: RangeInclusive<Location>) -> Iter<'_> {
         self.tree.range(place)
     }
 }

crates/dreammaker/src/error.rs

@@ -73,7 +73,7 @@ impl FileList {
     }
 
     /// Look up a file path by its index returned from `register_file`.
-    pub fn get_path(&self, file: FileId) -> Ref<Path> {
+    pub fn get_path(&self, file: FileId) -> Ref<'_, Path> {
         let files = self.files.borrow();
         if file == FILEID_BUILTINS {
             return Ref::map(files, |_| Path::new("(builtins)"));
@@ -108,7 +108,7 @@ impl Context {
     }
 
     /// Look up a file path by its index returned from `register_file`.
-    pub fn file_path(&self, file: FileId) -> Ref<Path> {
+    pub fn file_path(&self, file: FileId) -> Ref<'_, Path> {
         self.files.get_path(file)
     }
 
@@ -191,13 +191,13 @@ impl Context {
     }
 
     /// Access the list of diagnostics generated so far.
-    pub fn errors(&self) -> Ref<[DMError]> {
+    pub fn errors(&self) -> Ref<'_, [DMError]> {
         Ref::map(self.errors.borrow(), |x| &**x)
     }
 
     /// Mutably access the diagnostics list. Dangerous.
     #[doc(hidden)]
-    pub fn errors_mut(&self) -> RefMut<Vec<DMError>> {
+    pub fn errors_mut(&self) -> RefMut<'_, Vec<DMError>> {
         self.errors.borrow_mut()
     }
 

crates/dreammaker/src/lexer.rs

@@ -473,7 +473,7 @@ pub fn from_utf8_or_latin1(bytes: Vec<u8>) -> String {
 }
 
 /// Convert the input bytes to a `String` attempting UTF-8 or falling back to Latin-1.
-pub fn from_utf8_or_latin1_borrowed(bytes: &[u8]) -> Cow<str> {
+pub fn from_utf8_or_latin1_borrowed(bytes: &[u8]) -> Cow<'_, str> {
     match std::str::from_utf8(bytes) {
         Ok(v) => Cow::Borrowed(v),
         Err(_) => Cow::Owned(from_latin1(bytes)),

crates/dreammaker/src/lib.rs

@@ -123,7 +123,7 @@ pub fn pretty_print<W, I>(w: &mut W, input: I, show_ws: bool) -> std::fmt::Resul
 /// On Windows, this is a no-op.
 #[cfg(windows)]
 #[inline(always)]
-pub fn fix_case(path: &Path) -> Cow<Path> {
+pub fn fix_case(path: &Path) -> Cow<'_, Path> {
     Cow::Borrowed(path)
 }
 
@@ -132,7 +132,7 @@ pub fn fix_case(path: &Path) -> Cow<Path> {
 /// On non-Windows platforms, the parent of the given path is searched for a
 /// file with the same name but a different case.
 #[cfg(not(windows))]
-pub fn fix_case(path: &Path) -> Cow<Path> {
+pub fn fix_case(path: &Path) -> Cow<'_, Path> {
     if path.exists() {
         return Cow::Borrowed(path);
     }

crates/dreammaker/src/objtree.rs

@@ -673,18 +673,18 @@ impl ObjectTree {
         self.node_indices().map(move |idx| TypeRef::new(self, idx))
     }
 
-    pub fn root(&self) -> TypeRef {
+    pub fn root(&self) -> TypeRef<'_> {
         TypeRef::new(self, NodeIndex::new(0))
     }
 
-    pub fn find(&self, path: &str) -> Option<TypeRef> {
+    pub fn find(&self, path: &str) -> Option<TypeRef<'_>> {
         if path.is_empty() {
             return Some(self.root());
         }
         self.types.get(path).map(|&ix| TypeRef::new(self, ix))
     }
 
-    pub fn expect(&self, path: &str) -> TypeRef {
+    pub fn expect(&self, path: &str) -> TypeRef<'_> {
         match self.types.get(path) {
             Some(&ix) => TypeRef::new(self, ix),
             None => panic!("type not found: {path:?}"),
@@ -695,7 +695,7 @@ impl ObjectTree {
         self.graph.get(type_.parent_type.index())
     }
 
-    pub fn type_by_path<I>(&self, path: I) -> Option<TypeRef>
+    pub fn type_by_path<I>(&self, path: I) -> Option<TypeRef<'_>>
     where
         I: IntoIterator,
         I::Item: AsRef<str>,
@@ -708,7 +708,7 @@ impl ObjectTree {
         }
     }
 
-    pub fn type_by_path_approx<I>(&self, path: I) -> (bool, TypeRef)
+    pub fn type_by_path_approx<I>(&self, path: I) -> (bool, TypeRef<'_>)
     where
         I: IntoIterator,
         I::Item: AsRef<str>,
@@ -732,7 +732,7 @@ impl ObjectTree {
         (true, TypeRef::new(self, current))
     }
 
-    pub fn type_by_constant(&self, constant: &Constant) -> Option<TypeRef> {
+    pub fn type_by_constant(&self, constant: &Constant) -> Option<TypeRef<'_>> {
         match constant {
             Constant::String(string_path) => self.find(string_path),
             Constant::Prefab(pop) => self.type_by_path(pop.path.iter()),

crates/interval-tree/src/tree.rs

@@ -214,7 +214,7 @@ impl<K: Ord, V> IntervalTree<K, V> {
     /// }
     ///
     /// ```
-    pub fn range(&self, range: RangeInclusive<K>) -> RangePairIter<K, V> {
+    pub fn range(&self, range: RangeInclusive<K>) -> RangePairIter<'_, K, V> {
         RangePairIter::new(
             self,
             Bound::Included(range.start),
@@ -231,7 +231,7 @@ impl<K: Ord, V> IntervalTree<K, V> {
     /// }
     ///
     /// ```
-    pub fn iter(&self) -> RangePairIter<K, V> {
+    pub fn iter(&self) -> RangePairIter<'_, K, V> {
         RangePairIter::new(self, Bound::Unbounded, Bound::Unbounded)
     }
 }