Simplify some lifetimes

Author: camsteffen

src/modules.rs

@@ -95,16 +95,16 @@ pub(crate) enum ModuleResolutionErrorKind {
 }
 
 #[derive(Clone)]
-enum SubModKind<'a, 'ast> {
+enum SubModKind<'a> {
     /// `mod foo;`
-    External(PathBuf, DirectoryOwnership, Module<'ast>),
+    External(PathBuf, DirectoryOwnership, Module<'static>),
     /// `mod foo;` with multiple sources.
-    MultiExternal(Vec<(PathBuf, DirectoryOwnership, Module<'ast>)>),
+    MultiExternal(Vec<(PathBuf, DirectoryOwnership, Module<'static>)>),
     /// `mod foo {}`
     Internal(&'a ast::Item),
 }
 
-impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
+impl<'ast, 'sess> ModResolver<'ast, 'sess> {
     /// Creates a new `ModResolver`.
     pub(crate) fn new(
         parse_sess: &'sess ParseSess,
@@ -216,7 +216,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
 
     fn visit_sub_mod(
         &mut self,
-        item: &'c ast::Item,
+        item: &ast::Item,
         sub_mod: Module<'_>,
         from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
@@ -229,11 +229,11 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
     }
 
     /// Inspect the given sub-module which we are about to visit and returns its kind.
-    fn peek_sub_mod(
+    fn peek_sub_mod<'a>(
         &self,
-        item: &'c ast::Item,
+        item: &'a ast::Item,
         sub_mod: &Module<'_>,
-    ) -> Result<Option<SubModKind<'c, 'ast>>, ModuleResolutionError> {
+    ) -> Result<Option<SubModKind<'a>>, ModuleResolutionError> {
         if contains_skip(&item.attrs) {
             return Ok(None);
         }
@@ -250,7 +250,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
 
     fn insert_sub_mod(
         &mut self,
-        sub_mod_kind: SubModKind<'c, 'ast>,
+        sub_mod_kind: SubModKind<'_>,
     ) -> Result<(), ModuleResolutionError> {
         match sub_mod_kind {
             SubModKind::External(mod_path, _, sub_mod) => {
@@ -273,7 +273,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
     fn visit_sub_mod_inner(
         &mut self,
         sub_mod: Module<'_>,
-        sub_mod_kind: SubModKind<'c, 'ast>,
+        sub_mod_kind: SubModKind<'_>,
         from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
         match sub_mod_kind {
@@ -310,12 +310,12 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
     }
 
     /// Find a file path in the filesystem which corresponds to the given module.
-    fn find_external_module(
+    fn find_external_module<'a>(
         &self,
         mod_name: symbol::Ident,
-        attrs: &[ast::Attribute],
+        attrs: &'a [ast::Attribute],
         sub_mod: &Module<'_>,
-    ) -> Result<Option<SubModKind<'c, 'ast>>, ModuleResolutionError> {
+    ) -> Result<Option<SubModKind<'static>>, ModuleResolutionError> {
         let relative = match self.directory.ownership {
             DirectoryOwnership::Owned { relative } => relative,
             DirectoryOwnership::UnownedViaBlock => None,
@@ -480,7 +480,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         &self,
         attrs: &[ast::Attribute],
         sub_mod: &Module<'_>,
-    ) -> Vec<(PathBuf, DirectoryOwnership, Module<'ast>)> {
+    ) -> Vec<(PathBuf, DirectoryOwnership, Module<'static>)> {
         // Filter nested path, like `#[cfg_attr(feature = "foo", path = "bar.rs")]`.
         let mut path_visitor = visitor::PathVisitor::default();
         for attr in attrs.iter() {