Ignore sub-modules when skip-children is used
This commit is contained in:
parent
1c210eb3c6
commit
dae63e98ce
2 changed files with 5 additions and 5 deletions
|
@ -105,7 +105,7 @@ fn format_project<T: FormatHandler>(
|
||||||
let files = modules::ModResolver::new(
|
let files = modules::ModResolver::new(
|
||||||
context.parse_session.source_map(),
|
context.parse_session.source_map(),
|
||||||
directory_ownership.unwrap_or(parse::DirectoryOwnership::UnownedViaMod(false)),
|
directory_ownership.unwrap_or(parse::DirectoryOwnership::UnownedViaMod(false)),
|
||||||
input_is_stdin,
|
!(input_is_stdin || config.skip_children()),
|
||||||
)
|
)
|
||||||
.visit_crate(&krate)
|
.visit_crate(&krate)
|
||||||
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
|
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) struct ModResolver<'a, 'b> {
|
||||||
source_map: &'b source_map::SourceMap,
|
source_map: &'b source_map::SourceMap,
|
||||||
directory: Directory,
|
directory: Directory,
|
||||||
file_map: FileModMap<'a>,
|
file_map: FileModMap<'a>,
|
||||||
is_input_stdin: bool,
|
recursive: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
@ -31,7 +31,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
|
||||||
pub(crate) fn new(
|
pub(crate) fn new(
|
||||||
source_map: &'b source_map::SourceMap,
|
source_map: &'b source_map::SourceMap,
|
||||||
directory_ownership: DirectoryOwnership,
|
directory_ownership: DirectoryOwnership,
|
||||||
is_input_stdin: bool,
|
recursive: bool,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
ModResolver {
|
ModResolver {
|
||||||
directory: Directory {
|
directory: Directory {
|
||||||
|
@ -40,7 +40,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
|
||||||
},
|
},
|
||||||
file_map: BTreeMap::new(),
|
file_map: BTreeMap::new(),
|
||||||
source_map,
|
source_map,
|
||||||
is_input_stdin,
|
recursive,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ impl<'a, 'b> ModResolver<'a, 'b> {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Skip visiting sub modules when the input is from stdin.
|
// Skip visiting sub modules when the input is from stdin.
|
||||||
if !self.is_input_stdin {
|
if self.recursive {
|
||||||
self.visit_mod(&krate.module)?;
|
self.visit_mod(&krate.module)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue