From acc21fc9a61266a4f0413a862e1277f7d0796773 Mon Sep 17 00:00:00 2001 From: Rerumu Date: Thu, 19 May 2022 03:02:04 -0400 Subject: [PATCH] Simplify set creation code --- codegen-luajit/src/translator.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/codegen-luajit/src/translator.rs b/codegen-luajit/src/translator.rs index 8e00c61..a292f81 100644 --- a/codegen-luajit/src/translator.rs +++ b/codegen-luajit/src/translator.rs @@ -239,11 +239,7 @@ fn build_func_list(wasm: &Module, type_info: &TypeInfo) -> Vec { } fn write_localize_used(func_list: &[Intermediate], w: &mut dyn Write) -> Result<()> { - let mut loc_set = BTreeSet::new(); - - for func in func_list { - loc_set.extend(localize::visit(func)); - } + let loc_set: BTreeSet<_> = func_list.iter().flat_map(localize::visit).collect(); loc_set .into_iter() @@ -251,12 +247,7 @@ fn write_localize_used(func_list: &[Intermediate], w: &mut dyn Write) -> Result< } fn write_memory_used(func_list: &[Intermediate], w: &mut dyn Write) -> Result> { - let mut mem_set = BTreeSet::new(); - - for func in func_list { - mem_set.extend(memory::visit(func)); - } - + let mem_set: BTreeSet<_> = func_list.iter().flat_map(memory::visit).collect(); let list: Vec<_> = mem_set.into_iter().collect(); for mem in &list {