Factor out Module.ast_mod_kind

Author: camsteffen

src/modules.rs

@@ -25,7 +25,6 @@ type FileModMap<'ast> = BTreeMap<FileName, Module<'ast>>;
 /// Represents module with its inner attributes.
 #[derive(Debug, Clone)]
 pub(crate) struct Module<'a> {
-    ast_mod_kind: Option<Cow<'a, ast::ModKind>>,
     pub(crate) items: Cow<'a, ThinVec<rustc_ast::ptr::P<ast::Item>>>,
     inner_attr: ast::AttrVec,
     pub(crate) span: Span,
@@ -34,7 +33,6 @@ pub(crate) struct Module<'a> {
 impl<'a> Module<'a> {
     pub(crate) fn new(
         mod_span: Span,
-        ast_mod_kind: Option<Cow<'a, ast::ModKind>>,
         mod_items: Cow<'a, ThinVec<rustc_ast::ptr::P<ast::Item>>>,
         mod_attrs: &[ast::Attribute],
     ) -> Self {
@@ -47,7 +45,6 @@ impl<'a> Module<'a> {
             items: mod_items,
             inner_attr,
             span: mod_span,
-            ast_mod_kind,
         }
     }
 
@@ -139,7 +136,6 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             root_filename,
             Module::new(
                 mk_sp(snippet_provider.start_pos(), snippet_provider.end_pos()),
-                None,
                 Cow::Borrowed(&krate.items),
                 &krate.attrs,
             ),
@@ -167,17 +163,11 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             }
 
             if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind {
-                let span = item.span;
-                self.visit_sub_mod(
-                    &item,
-                    Module::new(
-                        span,
-                        Some(Cow::Owned(sub_mod_kind.clone())),
-                        Cow::Owned(ThinVec::new()),
-                        &[],
-                    ),
-                    false,
-                )?;
+                let items = match sub_mod_kind {
+                    ast::ModKind::Loaded(items, ..) => Cow::Owned(items.clone()),
+                    _ => Cow::Owned(ThinVec::new()),
+                };
+                self.visit_sub_mod(&item, Module::new(item.span, items, &[]), false)?;
             }
         }
         Ok(())
@@ -194,17 +184,11 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             }
 
             if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind {
-                let span = item.span;
-                self.visit_sub_mod(
-                    item,
-                    Module::new(
-                        span,
-                        Some(Cow::Borrowed(sub_mod_kind)),
-                        Cow::Owned(ThinVec::new()),
-                        &[],
-                    ),
-                    true,
-                )?;
+                let items = match sub_mod_kind {
+                    ast::ModKind::Loaded(items, ..) => Cow::Borrowed(items),
+                    _ => Cow::Owned(ThinVec::new()),
+                };
+                self.visit_sub_mod(item, Module::new(item.span, items, &[]), true)?;
             }
         }
         Ok(())
@@ -309,15 +293,11 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             self.directory = directory;
         }
         if from_ast {
-            if let Some(Cow::Borrowed(ast::ModKind::Loaded(items, _, _))) = &sub_mod.ast_mod_kind {
+            if let Cow::Borrowed(items) = sub_mod.items {
                 self.visit_mod_from_ast(items)?;
             }
         } else {
-            if let Some(Cow::Owned(ast::ModKind::Loaded(items, _, _))) = &sub_mod.ast_mod_kind {
-                self.visit_mod_outside_ast(items)?;
-            } else if let Cow::Owned(items) = &sub_mod.items {
-                self.visit_mod_outside_ast(items)?;
-            }
+            self.visit_mod_outside_ast(&sub_mod.items)?;
         }
         Ok(())
     }
@@ -342,12 +322,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                 Ok((attrs, items, span)) => Ok(Some(SubModKind::External(
                     path,
                     DirectoryOwnership::Owned { relative: None },
-                    Module::new(
-                        span,
-                        Some(Cow::Owned(ast::ModKind::Unloaded)),
-                        Cow::Owned(items),
-                        &attrs,
-                    ),
+                    Module::new(span, Cow::Owned(items), &attrs),
                 ))),
                 Err(ParserError::ParseError) => Err(ModuleResolutionError {
                     module: mod_name.to_string(),
@@ -392,24 +367,14 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                         Ok(Some(SubModKind::External(
                             file_path,
                             dir_ownership,
-                            Module::new(
-                                span,
-                                Some(Cow::Owned(ast::ModKind::Unloaded)),
-                                Cow::Owned(items),
-                                &attrs,
-                            ),
+                            Module::new(span, Cow::Owned(items), &attrs),
                         )))
                     }
                     Ok((attrs, items, span)) => {
                         mods_outside_ast.push((
                             file_path.clone(),
                             dir_ownership,
-                            Module::new(
-                                span,
-                                Some(Cow::Owned(ast::ModKind::Unloaded)),
-                                Cow::Owned(items),
-                                &attrs,
-                            ),
+                            Module::new(span, Cow::Owned(items), &attrs),
                         ));
                         if should_insert {
                             mods_outside_ast.push((file_path, dir_ownership, sub_mod.clone()));
@@ -532,12 +497,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             result.push((
                 actual_path,
                 DirectoryOwnership::Owned { relative: None },
-                Module::new(
-                    span,
-                    Some(Cow::Owned(ast::ModKind::Unloaded)),
-                    Cow::Owned(items),
-                    &attrs,
-                ),
+                Module::new(span, Cow::Owned(items), &attrs),
             ))
         }
         result