Merge pull request #3607 from topecongiro/issue-3493

Ignore sub-modules when skip-children is used

Author: scampi

src/formatting.rs

@@ -101,7 +101,7 @@ fn format_project<T: FormatHandler>(
     let files = modules::ModResolver::new(
         context.parse_session.source_map(),
         directory_ownership.unwrap_or(parse::DirectoryOwnership::UnownedViaMod(false)),
-        input_is_stdin,
+        !(input_is_stdin || config.skip_children()),
     )
     .visit_crate(&krate)
     .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;

src/modules.rs

@@ -18,7 +18,7 @@ pub(crate) struct ModResolver<'a, 'b> {
     source_map: &'b source_map::SourceMap,
     directory: Directory,
     file_map: FileModMap<'a>,
-    is_input_stdin: bool,
+    recursive: bool,
 }
 
 #[derive(Clone)]
@@ -32,7 +32,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
     pub(crate) fn new(
         source_map: &'b source_map::SourceMap,
         directory_ownership: DirectoryOwnership,
-        is_input_stdin: bool,
+        recursive: bool,
     ) -> Self {
         ModResolver {
             directory: Directory {
@@ -41,7 +41,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
             },
             file_map: BTreeMap::new(),
             source_map,
-            is_input_stdin,
+            recursive,
         }
     }
 
@@ -57,7 +57,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
         };
 
         // Skip visiting sub modules when the input is from stdin.
-        if !self.is_input_stdin {
+        if self.recursive {
             self.visit_mod(&krate.module)?;
         }
 

tests/source/configs/skip_children/true.rs

@@ -1,3 +1,4 @@
 // rustfmt-skip_children: true
 
 mod foo  ;
+mod void;

tests/target/configs/skip_children/true.rs

@@ -1,3 +1,4 @@
 // rustfmt-skip_children: true
 
 mod foo;
+mod void;