From 6d6832f3f1c898bbb37c0326b59c2808425d3f90 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 6 May 2022 19:05:24 +0000 Subject: [PATCH] Fix clippy lints --- src/builder.rs | 4 +--- src/constants/util.rs | 4 ++-- src/keys.rs | 9 +-------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index b87ba61c..c1a45b76 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -583,9 +583,7 @@ impl Bundle, V> { self, signatures: &[redpallas::Signature], ) -> Result { - signatures - .into_iter() - .try_fold(self, Self::append_signature) + signatures.iter().try_fold(self, Self::append_signature) } fn append_signature(self, signature: &redpallas::Signature) -> Result { diff --git a/src/constants/util.rs b/src/constants/util.rs index 756f6852..e9876ca0 100644 --- a/src/constants/util.rs +++ b/src/constants/util.rs @@ -8,10 +8,10 @@ pub fn gen_const_array( pub(crate) fn gen_const_array_with_default( default_value: Output, - mut closure: impl FnMut(usize) -> Output, + closure: impl FnMut(usize) -> Output, ) -> [Output; LEN] { let mut ret: [Output; LEN] = [default_value; LEN]; - for (bit, val) in ret.iter_mut().zip((0..LEN).map(|idx| closure(idx))) { + for (bit, val) in ret.iter_mut().zip((0..LEN).map(closure)) { *bit = val; } ret diff --git a/src/keys.rs b/src/keys.rs index 2a3ce7ca..0504dfa4 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -739,7 +739,7 @@ impl AsRef<[u8; 32]> for OutgoingViewingKey { /// Defined in [Zcash Protocol Spec ยง 4.2.3: Orchard Key Components][orchardkeycomponents]. /// /// [orchardkeycomponents]: https://zips.z.cash/protocol/nu5.pdf#orchardkeycomponents -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub struct DiversifiedTransmissionKey(NonIdentityPallasPoint); impl DiversifiedTransmissionKey { @@ -772,13 +772,6 @@ impl DiversifiedTransmissionKey { } } -// Required for CtOption operations. -impl Default for DiversifiedTransmissionKey { - fn default() -> Self { - DiversifiedTransmissionKey(NonIdentityPallasPoint::default()) - } -} - impl ConditionallySelectable for DiversifiedTransmissionKey { fn conditional_select(a: &Self, b: &Self, choice: Choice) -> Self { DiversifiedTransmissionKey(NonIdentityPallasPoint::conditional_select(