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,
         }
     }
 
@@ -57,10 +54,6 @@ impl<'a> Module<'a> {
 
     pub(crate) fn to_owned(&self) -> Module<'static> {
         Module {
-            ast_mod_kind: self
-                .ast_mod_kind
-                .as_ref()
-                .map(|i| Cow::Owned((**i).clone())),
             items: Cow::Owned((&*self.items).clone()),
             inner_attr: self.inner_attr.clone(),
             span: self.span,
@@ -151,7 +144,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,
             ),
@@ -175,15 +167,11 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
             if is_cfg_if(item) {
                 self.visit_cfg_if(item)?;
             } else if let ast::ItemKind::Mod(_, sub_mod_kind) = &item.kind {
-                self.visit_sub_mod(
-                    &item,
-                    Module::new(
-                        item.span,
-                        Some(Cow::Borrowed(sub_mod_kind)),
-                        Cow::Owned(ThinVec::new()),
-                        &[],
-                    ),
-                )?;
+                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, &[]))?;
             }
         }
         Ok(())
@@ -284,11 +272,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         if let Some(directory) = directory {
             self.directory = directory;
         }
-        if let Some(ast::ModKind::Loaded(items, _, _)) = sub_mod.ast_mod_kind.as_deref() {
-            self.visit_mod(&items)
-        } else {
-            self.visit_mod(&sub_mod.items)
-        }
+        self.visit_mod(&sub_mod.items)
     }
 
     /// Find a file path in the filesystem which corresponds to the given module.
@@ -311,12 +295,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(),
@@ -361,24 +340,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.to_owned()));
@@ -501,12 +470,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