Rm impl trait + lifetime

Author: azdavis

crates/analysis/src/matcher.rs

@@ -6,7 +6,7 @@ use std::fmt;
 pub(crate) fn display(
   starting_bar: bool,
   variants: &[(str_util::Name, bool)],
-) -> impl fmt::Display + '_ {
+) -> impl fmt::Display {
   CaseDisplay { starting_bar, variants }
 }
 

crates/input/src/util.rs

@@ -169,7 +169,7 @@ impl Error {
   ///
   /// Any paths in the error will be relative to `root` if they are contained in `root`.
   #[must_use]
-  pub fn display<'a>(&'a self, root: &'a Path) -> impl fmt::Display + 'a {
+  pub fn display<'a>(&'a self, root: &'a Path) -> impl fmt::Display {
     ErrorDisplay { err: self, root }
   }
 }

crates/sml-hir/src/lib.rs

@@ -341,7 +341,7 @@ pub struct OrPat {
 
 impl OrPat {
   /// Returns an iterator of all the pats in order.
-  pub fn all_pats(&self) -> impl Iterator<Item = PatIdx> + '_ {
+  pub fn all_pats(&self) -> impl Iterator<Item = PatIdx> {
     std::iter::once(self.first).chain(self.rest.iter().copied())
   }
 }

crates/sml-statics-types/src/display.rs

@@ -12,7 +12,7 @@ use std::fmt;
 impl Ty {
   /// Returns a value that displays this.
   #[must_use]
-  pub fn display(self, st: &St, lines: config::DiagnosticLines) -> impl fmt::Display + '_ {
+  pub fn display(self, st: &St, lines: config::DiagnosticLines) -> impl fmt::Display {
     TyDisplay {
       cx: TyDisplayCx { bound_vars: None, st },
       ty: self,
@@ -25,11 +25,7 @@ impl Ty {
 impl TyScheme {
   /// Returns a value that displays this.
   #[must_use]
-  pub fn display<'a>(
-    &'a self,
-    st: &'a St,
-    lines: config::DiagnosticLines,
-  ) -> impl fmt::Display + 'a {
+  pub fn display<'a>(&'a self, st: &'a St, lines: config::DiagnosticLines) -> impl fmt::Display {
     TyDisplay {
       cx: TyDisplayCx { bound_vars: Some(&self.bound_vars), st },
       ty: self.ty,
@@ -273,7 +269,7 @@ impl fmt::Display for RowDisplay<'_> {
 }
 
 impl Sym {
-  pub(crate) fn display(self, syms: &Syms) -> impl fmt::Display + '_ {
+  pub(crate) fn display(self, syms: &Syms) -> impl fmt::Display {
     SymDisplay { sym: self, syms }
   }
 }
@@ -318,7 +314,7 @@ pub fn record_meta_var<'a>(
   st: &'a St,
   rows: &'a RecordData,
   lines: config::DiagnosticLines,
-) -> impl fmt::Display + 'a {
+) -> impl fmt::Display {
   RecordMetaVarDisplay {
     cx: TyDisplayCx { bound_vars: None, st },
     rows,
@@ -366,7 +362,7 @@ impl fmt::Display for RecordMetaVarDisplay<'_> {
 impl Incompatible {
   /// Returns a value that displays this.
   #[must_use]
-  pub fn display<'a>(&'a self, st: &'a St) -> impl fmt::Display + 'a {
+  pub fn display<'a>(&'a self, st: &'a St) -> impl fmt::Display {
     IncompatibleDisplay { flavor: self, st }
   }
 }

crates/sml-statics-types/src/generalize.rs

@@ -26,7 +26,7 @@ impl FixedTyVars {
   }
 
   /// Iterates over the fixed ty vars.
-  pub fn iter(&self) -> impl Iterator<Item = Ty> + '_ {
+  pub fn iter(&self) -> impl Iterator<Item = Ty> {
     self.0.iter().map(|(&idx, _)| Ty { kind: TyKind::FixedVar, idx })
   }
 }

crates/sml-statics-types/src/sym.rs

@@ -131,12 +131,12 @@ impl SymValEnv {
   }
 
   /// Returns an iterator over the key-value pairs in insertion order.
-  pub fn iter(&self) -> impl Iterator<Item = (&str_util::Name, &ValInfo)> + '_ {
+  pub fn iter(&self) -> impl Iterator<Item = (&str_util::Name, &ValInfo)> {
     self.order.iter().map(|k| (k, &self.map[k]))
   }
 
   /// Returns an iterator over the key and mutable value pairs in an arbitrary order.
-  pub fn iter_mut(&mut self) -> impl Iterator<Item = (&str_util::Name, &mut ValInfo)> + '_ {
+  pub fn iter_mut(&mut self) -> impl Iterator<Item = (&str_util::Name, &mut ValInfo)> {
     self.map.iter_mut()
   }
 }

crates/sml-statics/src/error.rs

@@ -244,7 +244,7 @@ impl Error {
     &'a self,
     st: &'a sml_statics_types::St,
     lines: config::DiagnosticLines,
-  ) -> impl fmt::Display + 'a {
+  ) -> impl fmt::Display {
     ErrorKindDisplay { kind: &self.kind, st, lines }
   }
 

crates/sml-statics/src/info.rs

@@ -34,7 +34,7 @@ impl Defs {
     }
   }
 
-  fn with_def(&self, def: def::Def) -> impl Iterator<Item = sml_hir::Idx> + '_ {
+  fn with_def(&self, def: def::Def) -> impl Iterator<Item = sml_hir::Idx> {
     std::iter::empty::<(sml_hir::Idx, &def::Set)>()
       .chain(self.str_exp.iter().map(|(idx, set)| (idx.into(), set)))
       .chain(self.sig_exp.iter().map(|(idx, set)| (idx.into(), set)))
@@ -244,7 +244,7 @@ impl Info {
   }
 
   /// Returns indices that have the given definition.
-  pub fn get_with_def(&self, def: def::Def) -> impl Iterator<Item = sml_hir::Idx> + '_ {
+  pub fn get_with_def(&self, def: def::Def) -> impl Iterator<Item = sml_hir::Idx> {
     self.entries.defs.with_def(def)
   }
 

crates/tests/src/check/expect.rs

@@ -24,7 +24,7 @@ impl File {
     self.inner.is_empty()
   }
 
-  pub fn iter(&self) -> impl Iterator<Item = (&Region, &Expect)> + '_ {
+  pub fn iter(&self) -> impl Iterator<Item = (&Region, &Expect)> {
     self.inner.iter()
   }
 }

crates/tests/src/repo.rs

@@ -356,7 +356,7 @@ fn is_section_comment(s: &str, comment_open: &str, section: &str) -> bool {
   s.trim().strip_prefix(comment_open).and_then(|s| s.strip_suffix(COMMENT_CLOSE)) == Some(section)
 }
 
-fn get_manual_section(section: &str) -> impl Iterator<Item = &'static str> + '_ {
+fn get_manual_section(section: &str) -> impl Iterator<Item = &'static str> {
   let mut iter = MANUAL.lines();
   iter.find(|s| is_section_comment(s, "<!-- @begin ", section));
   iter.take_while(|s| !is_section_comment(s, "<!-- @end ", section))