Collapse visit_mod methods

Author: camsteffen

src/modules.rs

@@ -142,7 +142,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
 
         // Skip visiting sub modules when the input is from stdin.
         if self.recursive {
-            self.visit_mod_from_ast(&krate.items)?;
+            self.visit_mod(&krate.items)?;
         }
 
         let snippet_provider = self.parse_sess.snippet_provider(krate.spans.inner_span);
@@ -163,53 +163,22 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
     fn visit_cfg_if(&mut self, item: &ast::Item) -> Result<(), ModuleResolutionError> {
         let mut visitor = visitor::CfgIfVisitor::new(self.parse_sess);
         visitor.visit_item(item);
-        self.visit_mod_outside_ast(&visitor.items)?;
+        self.visit_mod(&visitor.items)?;
         Ok(())
     }
 
-    /// Visit modules defined inside macro calls.
-    fn visit_mod_outside_ast(
+    fn visit_mod(
         &mut self,
         items: &[rustc_ast::ptr::P<ast::Item>],
     ) -> Result<(), ModuleResolutionError> {
         for item in items {
             if is_cfg_if(item) {
                 self.visit_cfg_if(item)?;
-                continue;
-            }
-
-            if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind {
-                let span = item.span;
+            } else if let ast::ItemKind::Mod(_, sub_mod_kind) = &item.kind {
                 self.visit_sub_mod(
                     &item,
                     Module::new(
-                        span,
-                        Some(Cow::Borrowed(sub_mod_kind)),
-                        Cow::Owned(ThinVec::new()),
-                        &[],
-                    ),
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Visit modules from AST.
-    fn visit_mod_from_ast(
-        &mut self,
-        items: &[rustc_ast::ptr::P<ast::Item>],
-    ) -> Result<(), ModuleResolutionError> {
-        for item in items {
-            if is_cfg_if(item) {
-                self.visit_cfg_if(item)?;
-            }
-
-            if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind {
-                let span = item.span;
-                self.visit_sub_mod(
-                    item,
-                    Module::new(
-                        span,
+                        item.span,
                         Some(Cow::Borrowed(sub_mod_kind)),
                         Cow::Owned(ThinVec::new()),
                         &[],
@@ -315,14 +284,10 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         if let Some(directory) = directory {
             self.directory = directory;
         }
-        match (sub_mod.ast_mod_kind, sub_mod.items) {
-            (Some(Cow::Borrowed(ast::ModKind::Loaded(items, _, _))), _) => {
-                self.visit_mod_from_ast(items)
-            }
-            (Some(Cow::Owned(ast::ModKind::Loaded(items, _, _))), _) | (_, Cow::Owned(items)) => {
-                self.visit_mod_outside_ast(&items)
-            }
-            (_, _) => Ok(()),
+        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)
         }
     }