From 17ed6a2b040ad299588c32a3e820261b6d380ba3 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Fri, 1 Oct 2021 17:12:46 +0200
Subject: [PATCH] Clippy

---
 src/plonk/proof.rs        |  4 ++--
 src/util/serialization.rs | 23 ++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/plonk/proof.rs b/src/plonk/proof.rs
index 4c9bfc65..8ee20bc7 100644
--- a/src/plonk/proof.rs
+++ b/src/plonk/proof.rs
@@ -87,7 +87,7 @@ impl<F: RichField + Extendable<D>, const D: usize> ProofWithPublicInputs<F, D> {
 
     pub fn to_bytes(&self) -> anyhow::Result<Vec<u8>> {
         let mut buffer = Buffer::new(Vec::new());
-        buffer.write_proof_with_public_inputs(&self)?;
+        buffer.write_proof_with_public_inputs(self)?;
         Ok(buffer.bytes())
     }
 
@@ -168,7 +168,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CompressedProofWithPublicInpu
 
     pub fn to_bytes(&self) -> anyhow::Result<Vec<u8>> {
         let mut buffer = Buffer::new(Vec::new());
-        buffer.write_compressed_proof_with_public_inputs(&self)?;
+        buffer.write_compressed_proof_with_public_inputs(self)?;
         Ok(buffer.bytes())
     }
 
diff --git a/src/util/serialization.rs b/src/util/serialization.rs
index d83839d9..bfc0473e 100644
--- a/src/util/serialization.rs
+++ b/src/util/serialization.rs
@@ -1,21 +1,18 @@
 use std::collections::HashMap;
 use std::convert::TryInto;
-use std::fmt;
 use std::io::Cursor;
-use std::io::{Error, ErrorKind, Read, Result, Write};
+use std::io::{Read, Result, Write};
 use std::iter::FromIterator;
 
-use crate::field::crandall_field::CrandallField;
-use crate::field::extension_field::quartic::QuarticExtension;
 use crate::field::extension_field::{Extendable, FieldExtension};
-use crate::field::field_types::{Field, PrimeField, RichField};
+use crate::field::field_types::{PrimeField, RichField};
 use crate::fri::proof::{
     CompressedFriProof, CompressedFriQueryRounds, FriInitialTreeProof, FriProof, FriQueryRound,
     FriQueryStep,
 };
 use crate::hash::hash_types::HashOut;
 use crate::hash::merkle_proofs::MerkleProof;
-use crate::hash::merkle_tree::{MerkleCap, MerkleTree};
+use crate::hash::merkle_tree::MerkleCap;
 use crate::plonk::circuit_data::{CircuitConfig, CommonCircuitData};
 use crate::plonk::proof::{
     CompressedProof, CompressedProofWithPublicInputs, OpeningSet, Proof, ProofWithPublicInputs,
@@ -119,9 +116,9 @@ impl Buffer {
         Ok(())
     }
     fn read_field_vec<F: PrimeField>(&mut self, length: usize) -> Result<Vec<F>> {
-        Ok((0..length)
+        (0..length)
             .map(|_| self.read_field())
-            .collect::<Result<Vec<_>>>()?)
+            .collect::<Result<Vec<_>>>()
     }
 
     fn write_field_ext_vec<F: Extendable<D>, const D: usize>(
@@ -137,9 +134,9 @@ impl Buffer {
         &mut self,
         length: usize,
     ) -> Result<Vec<F::Extension>> {
-        Ok((0..length)
+        (0..length)
             .map(|_| self.read_field_ext::<F, D>())
-            .collect::<Result<Vec<_>>>()?)
+            .collect::<Result<Vec<_>>>()
     }
 
     fn write_opening_set<F: Extendable<D>, const D: usize>(
@@ -187,7 +184,7 @@ impl Buffer {
             length
                 .try_into()
                 .expect("Merkle proof length must fit in u8."),
-        );
+        )?;
         for &h in &p.siblings {
             self.write_hash(h)?;
         }
@@ -278,7 +275,7 @@ impl Buffer {
         config: &CircuitConfig,
     ) -> Result<Vec<FriQueryRound<F, D>>> {
         let mut fqrs = Vec::with_capacity(config.fri_config.num_query_rounds);
-        for i in 0..config.fri_config.num_query_rounds {
+        for _ in 0..config.fri_config.num_query_rounds {
             let initial_trees_proof = self.read_fri_initial_proof(common_data, config)?;
             let steps = config
                 .fri_config
@@ -413,7 +410,7 @@ impl Buffer {
             .map(|_| self.read_u32().map(|i| i as usize))
             .collect::<Result<Vec<_>>>()?;
         let mut indices = original_indices.clone();
-        indices.sort();
+        indices.sort_unstable();
         indices.dedup();
         let mut pairs = Vec::new();
         for &i in &indices {