From 6863eea74eb17107f580c38a542a45f3b895fcb8 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Mon, 13 Dec 2021 16:51:36 +0100 Subject: [PATCH] New clippy lints --- src/field/fft.rs | 2 +- src/gadgets/sorting.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/field/fft.rs b/src/field/fft.rs index 76e0fd42..ba94f6a7 100644 --- a/src/field/fft.rs +++ b/src/field/fft.rs @@ -43,7 +43,7 @@ fn fft_dispatch( } else { Some(fft_root_table(input.len())) }; - let used_root_table = root_table.or_else(|| computed_root_table.as_ref()).unwrap(); + let used_root_table = root_table.or(computed_root_table.as_ref()).unwrap(); fft_classic(input, zero_factor.unwrap_or(0), used_root_table) } diff --git a/src/gadgets/sorting.rs b/src/gadgets/sorting.rs index 2059a888..c4378ab9 100644 --- a/src/gadgets/sorting.rs +++ b/src/gadgets/sorting.rs @@ -128,8 +128,7 @@ impl, const D: usize> SimpleGenerator fn dependencies(&self) -> Vec { self.input_ops .iter() - .map(|op| vec![op.is_write.target, op.address, op.timestamp, op.value]) - .flatten() + .flat_map(|op| vec![op.is_write.target, op.address, op.timestamp, op.value]) .collect() }