From 8549ec19447b0f090042795938a6df73c9cae150 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 10 Jan 2021 18:07:44 +0000 Subject: [PATCH] otterlib: list all libs together Signed-off-by: Ian Jackson --- src/bin/otterlib.rs | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs index c2fc51ed..16e0011c 100644 --- a/src/bin/otterlib.rs +++ b/src/bin/otterlib.rs @@ -40,13 +40,21 @@ fn main() { let libs = Config1::PathGlob(opts.libs.clone()); load(&vec![libs.clone()])?; - let libnames = libs_list(); - for lib in libnames { - let contents = libs_lookup(&lib)?; - let items = contents.list_glob(&opts.items)?; - for item in items { - println!("{}", item.line_for_list()); - } + let items : Vec = + libs_list() + .into_iter() + .map(|lib| { + let contents = libs_lookup(&lib)?; + let items = contents.list_glob(&opts.items)?; + Ok::<_,AE>(items) + }) + .collect::,_>>()? + .into_iter() + .flatten() + .collect(); + + for item in &items { + println!("{}", item.line_for_list()); } } -- 2.30.2