Skip to content

Commit f520f7e

Browse files
committed
Suppress spurious parse error messages on skipped files
1 parent a20ffc6 commit f520f7e

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Diff for: src/formatting.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ fn format_project<T: FormatHandler>(
6767
let main_file = input.file_name();
6868
let input_is_stdin = main_file == FileName::Stdin;
6969

70+
let ignore_path_set = match IgnorePathSet::from_ignore_list(&config.ignore()) {
71+
Ok(set) => set,
72+
Err(e) => return Err(ErrorKind::InvalidGlobPattern(e)),
73+
};
74+
if config.skip_children() && ignore_path_set.is_match(&main_file) {
75+
return Ok(FormatReport::new());
76+
}
77+
7078
// Parse the crate.
7179
let source_map = Rc::new(SourceMap::new(FilePathMapping::empty()));
7280
let mut parse_session = make_parse_sess(source_map.clone(), config);
@@ -91,11 +99,6 @@ fn format_project<T: FormatHandler>(
9199
parse_session.span_diagnostic = Handler::with_emitter(true, None, silent_emitter);
92100

93101
let mut context = FormatContext::new(&krate, report, parse_session, config, handler);
94-
let ignore_path_set = match IgnorePathSet::from_ignore_list(&config.ignore()) {
95-
Ok(set) => set,
96-
Err(e) => return Err(ErrorKind::InvalidGlobPattern(e)),
97-
};
98-
99102
let files = modules::ModResolver::new(
100103
context.parse_session.source_map(),
101104
directory_ownership.unwrap_or(parse::DirectoryOwnership::UnownedViaMod(false)),

0 commit comments

Comments
 (0)