Collapse visit_mod methods

Author: camsteffen

src/modules.rs

@@ -135,7 +135,7 @@ impl<'ast, 'sess> 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, true)?;
         }
 
         let snippet_provider = self.parse_sess.snippet_provider(krate.spans.inner_span);
@@ -155,36 +155,14 @@ impl<'ast, 'sess> 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, false)?;
         Ok(())
     }
 
-    /// Visit modules defined inside macro calls.
-    fn visit_mod_outside_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)?;
-                continue;
-            }
-
-            if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind {
-                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, &[]), false)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Visit modules from AST.
-    fn visit_mod_from_ast(
+    fn visit_mod(
         &mut self,
         items: &[rustc_ast::ptr::P<ast::Item>],
+        from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
         for item in items {
             if is_cfg_if(item) {
@@ -196,7 +174,7 @@ impl<'ast, 'sess> ModResolver<'ast, 'sess> {
                     ast::ModKind::Loaded(items, ..) => Cow::Borrowed(items),
                     _ => Cow::Owned(ThinVec::new()),
                 };
-                self.visit_sub_mod(item, Module::new(item.span, items, &[]), true)?;
+                self.visit_sub_mod(&item, Module::new(item.span, items, &[]), from_ast)?;
             }
         }
         Ok(())
@@ -270,27 +248,19 @@ impl<'ast, 'sess> ModResolver<'ast, 'sess> {
                     path: mod_path.parent().unwrap().to_path_buf(),
                     ownership: directory_ownership,
                 };
-                self.with_directory(directory, |this| this.visit_mod_outside_ast(&sub_mod.items))?;
+                self.with_directory(directory, |this| this.visit_mod(&sub_mod.items, false))?;
             }
             SubModKind::Internal(item) => {
                 let directory = self.inline_mod_directory(item.ident, &item.attrs);
-                self.with_directory(directory, |this| {
-                    if from_ast {
-                        this.visit_mod_from_ast(&sub_mod.items)
-                    } else {
-                        this.visit_mod_outside_ast(&sub_mod.items)
-                    }
-                })?;
+                self.with_directory(directory, |this| this.visit_mod(&sub_mod.items, from_ast))?;
             }
             SubModKind::MultiExternal(mods) => {
                 for (mod_path, directory_ownership, sub_mod) in mods {
                     let directory = Directory {
                         path: mod_path.parent().unwrap().to_path_buf(),
                         ownership: directory_ownership,
                     };
-                    self.with_directory(directory, |this| {
-                        this.visit_mod_outside_ast(&sub_mod.items)
-                    })?;
+                    self.with_directory(directory, |this| this.visit_mod(&sub_mod.items, false))?;
                 }
             }
         }