From 6d6832f3f1c898bbb37c0326b59c2808425d3f90 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Fri, 6 May 2022 19:05:24 +0000
Subject: [PATCH 1/2] 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<P: fmt::Debug, V> Bundle<InProgress<P, PartiallyAuthorized>, V> {
         self,
         signatures: &[redpallas::Signature<SpendAuth>],
     ) -> Result<Self, Error> {
-        signatures
-            .into_iter()
-            .try_fold(self, Self::append_signature)
+        signatures.iter().try_fold(self, Self::append_signature)
     }
 
     fn append_signature(self, signature: &redpallas::Signature<SpendAuth>) -> Result<Self, Error> {
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<Output: Copy + Default, const LEN: usize>(
 
 pub(crate) fn gen_const_array_with_default<Output: Copy, const LEN: usize>(
     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(

From 07a88ae9f95d181caca620bc68e88d77f4e1d51e Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Fri, 6 May 2022 19:10:45 +0000
Subject: [PATCH 2/2] Fix rustdoc lint

---
 src/circuit/gadget.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/circuit/gadget.rs b/src/circuit/gadget.rs
index f35e431e..522e2a65 100644
--- a/src/circuit/gadget.rs
+++ b/src/circuit/gadget.rs
@@ -88,8 +88,8 @@ pub(in crate::circuit) trait AddInstruction<F: FieldExt>: Chip<F> {
 /// Witnesses the given value in a standalone region.
 ///
 /// Usages of this helper are technically superfluous, as the single-cell region is only
-/// ever used in equality constraints. We could eliminate them with a write-on-copy
-/// abstraction (https://github.com/zcash/halo2/issues/334).
+/// ever used in equality constraints. We could eliminate them with a
+/// [write-on-copy abstraction](https://github.com/zcash/halo2/issues/334).
 pub(in crate::circuit) fn assign_free_advice<F: Field, V: Copy>(
     mut layouter: impl Layouter<F>,
     column: Column<Advice>,