remove "inculde-non-png" complete
This commit is contained in:
parent
7ccc385438
commit
eda1de4f2d
1 changed files with 2 additions and 9 deletions
11
src/main.rs
11
src/main.rs
|
|
@ -355,7 +355,6 @@ fn collect_files(
|
||||||
out_dir: &Option<PathBuf>,
|
out_dir: &Option<PathBuf>,
|
||||||
out_file: &OutFile,
|
out_file: &OutFile,
|
||||||
recursive: bool,
|
recursive: bool,
|
||||||
include_non_png: bool,
|
|
||||||
top_level: bool, //explicitly specify files
|
top_level: bool, //explicitly specify files
|
||||||
) -> Vec<(InFile, OutFile)> {
|
) -> Vec<(InFile, OutFile)> {
|
||||||
let mut in_out_pairs = Vec::new();
|
let mut in_out_pairs = Vec::new();
|
||||||
|
|
@ -367,14 +366,8 @@ fn collect_files(
|
||||||
match input.read_dir() {
|
match input.read_dir() {
|
||||||
Ok(dir) => {
|
Ok(dir) => {
|
||||||
let files = dir.filter_map(|x| x.ok().map(|x| x.path())).collect();
|
let files = dir.filter_map(|x| x.ok().map(|x| x.path())).collect();
|
||||||
in_out_pairs.extend(collect_files(
|
in_out_pairs
|
||||||
files,
|
.extend(collect_files(files, out_dir, out_file, recursive, false));
|
||||||
out_dir,
|
|
||||||
out_file,
|
|
||||||
recursive,
|
|
||||||
include_non_png,
|
|
||||||
false,
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
warn!("{}: {}", input.display(), e);
|
warn!("{}: {}", input.display(), e);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue