Introduce from_ast boolean

Author: camsteffen

src/modules.rs

@@ -161,6 +161,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                         Cow::Owned(ThinVec::new()),
                         &[],
                     ),
+                    false,
                 )?;
             }
         }
@@ -188,6 +189,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                         Cow::Owned(ThinVec::new()),
                         &[],
                     ),
+                    false,
                 )?;
             }
         }
@@ -214,6 +216,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                         Cow::Owned(ThinVec::new()),
                         &[],
                     ),
+                    true,
                 )?;
             }
         }
@@ -224,12 +227,13 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         &mut self,
         item: &'c ast::Item,
         sub_mod: Module<'ast>,
+        from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
         let old_directory = self.directory.clone();
         let sub_mod_kind = self.peek_sub_mod(item, &sub_mod)?;
         if let Some(sub_mod_kind) = sub_mod_kind {
             self.insert_sub_mod(sub_mod_kind.clone())?;
-            self.visit_sub_mod_inner(sub_mod, sub_mod_kind)?;
+            self.visit_sub_mod_inner(sub_mod, sub_mod_kind, from_ast)?;
         }
         self.directory = old_directory;
         Ok(())
@@ -281,26 +285,27 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         &mut self,
         sub_mod: Module<'ast>,
         sub_mod_kind: SubModKind<'c, 'ast>,
+        from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
         match sub_mod_kind {
             SubModKind::External(mod_path, directory_ownership, sub_mod) => {
                 let directory = Directory {
                     path: mod_path.parent().unwrap().to_path_buf(),
                     ownership: directory_ownership,
                 };
-                self.visit_sub_mod_after_directory_update(sub_mod, Some(directory))
+                self.visit_sub_mod_after_directory_update(sub_mod, Some(directory), false)
             }
             SubModKind::Internal(item) => {
                 self.push_inline_mod_directory(item.ident, &item.attrs);
-                self.visit_sub_mod_after_directory_update(sub_mod, None)
+                self.visit_sub_mod_after_directory_update(sub_mod, None, 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.visit_sub_mod_after_directory_update(sub_mod, Some(directory))?;
+                    self.visit_sub_mod_after_directory_update(sub_mod, Some(directory), false)?;
                 }
                 Ok(())
             }
@@ -311,19 +316,23 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
         &mut self,
         sub_mod: Module<'ast>,
         directory: Option<Directory>,
+        from_ast: bool,
     ) -> Result<(), ModuleResolutionError> {
         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)
+        if from_ast {
+            if let Some(Cow::Borrowed(ast::ModKind::Loaded(items, _, _))) = &sub_mod.ast_mod_kind {
+                self.visit_mod_from_ast(items)?;
             }
-            (Some(Cow::Owned(ast::ModKind::Loaded(items, _, _))), _) | (_, Cow::Owned(items)) => {
-                self.visit_mod_outside_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)?;
             }
-            (_, _) => Ok(()),
         }
+        Ok(())
     }
 
     /// Find a file path in the filesystem which corresponds to the given module.