Readability fixes

This commit is contained in:
Matthias Beyer 2015-12-05 11:10:54 +01:00
parent 93393751b2
commit 9f59478da0

View file

@ -137,7 +137,8 @@ fn get_filtered_files_from_backend<'a>(module: &'a Module,
let parser = Parser::new(JsonHeaderParser::new(None)); let parser = Parser::new(JsonHeaderParser::new(None));
let tags = get_tags(env.rt, env.matches); let tags = get_tags(env.rt, env.matches);
debug!("Tags: {:?}", tags); debug!("Tags: {:?}", tags);
env.bk.iter_files(module, &parser) env.bk
.iter_files(module, &parser)
.map(|files| { .map(|files| {
files.filter(|file| { files.filter(|file| {
debug!("Backend returns file: {:?}", file); debug!("Backend returns file: {:?}", file);
@ -145,9 +146,11 @@ fn get_filtered_files_from_backend<'a>(module: &'a Module,
}).filter(|file| { }).filter(|file| {
debug!("Checking matches of: {:?}", file.id()); debug!("Checking matches of: {:?}", file.id());
get_matcher(env.rt, env.matches) get_matcher(env.rt, env.matches)
.and_then(|r| Some(file.matches_with(&r))) .map(|r| file.matches_with(&r))
.unwrap_or(true) .unwrap_or(true)
}).collect::<Vec<File>>().into_iter() })
.collect::<Vec<File>>()
.into_iter()
}).map_err(|e| { }).map_err(|e| {
debug!("Error from Backend: {:?}", e); debug!("Error from Backend: {:?}", e);
let mut merr = ModuleError::new("Could not filter files"); let mut merr = ModuleError::new("Could not filter files");