diff --git a/zcash_primitives/src/transaction/components/orchard.rs b/zcash_primitives/src/transaction/components/orchard.rs
index fb7bfde2c..80c42a6fd 100644
--- a/zcash_primitives/src/transaction/components/orchard.rs
+++ b/zcash_primitives/src/transaction/components/orchard.rs
@@ -15,8 +15,8 @@ use orchard::{
     value::{NoteValue, ValueCommitment},
     Action, Anchor,
 };
-use zcash_note_encryption::note_bytes::NoteBytes;
 use zcash_encoding::{Array, CompactSize, Vector};
+use zcash_note_encryption::note_bytes::NoteBytes;
 
 use super::Amount;
 use crate::transaction::Transaction;
@@ -189,7 +189,8 @@ pub fn read_note_ciphertext<R: Read>(
         epk_bytes: [0u8; 32],
         enc_ciphertext: <OrchardVanilla as OrchardDomainCommon>::NoteCiphertextBytes::from_slice(
             [0u8; OrchardVanilla::ENC_CIPHERTEXT_SIZE].as_ref(),
-        ).expect("OrchardVanilla note ciphertext is of the correct size"),
+        )
+        .expect("OrchardVanilla note ciphertext is of the correct size"),
         out_ciphertext: [0u8; 80],
     };
 
@@ -207,7 +208,8 @@ pub fn read_zsa_note_ciphertext<R: Read>(
         epk_bytes: [0u8; 32],
         enc_ciphertext: <OrchardZSA as OrchardDomainCommon>::NoteCiphertextBytes::from_slice(
             [0u8; OrchardZSA::ENC_CIPHERTEXT_SIZE].as_ref(),
-        ).expect("OrchardZSA note ciphertext is of the correct size"),
+        )
+        .expect("OrchardZSA note ciphertext is of the correct size"),
         out_ciphertext: [0u8; 80],
     };
 
diff --git a/zcash_primitives/src/transaction/components/sapling.rs b/zcash_primitives/src/transaction/components/sapling.rs
index 4a954de47..62e493865 100644
--- a/zcash_primitives/src/transaction/components/sapling.rs
+++ b/zcash_primitives/src/transaction/components/sapling.rs
@@ -6,7 +6,7 @@ use zcash_protocol::consensus::{BlockHeight, NetworkUpgrade, Parameters, ZIP212_
 use std::io::{self, Read, Write};
 
 use zcash_encoding::{Array, CompactSize, Vector};
-use zcash_note_encryption::{ENC_CIPHERTEXT_SIZE, EphemeralKeyBytes, OUT_CIPHERTEXT_SIZE};
+use zcash_note_encryption::{EphemeralKeyBytes, ENC_CIPHERTEXT_SIZE, OUT_CIPHERTEXT_SIZE};
 
 use crate::{
     sapling::{