From 40f53460091238c14e5b70f7505a7bdd9f413857 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Mon, 28 Jun 2021 17:07:27 -0700
Subject: [PATCH] cargo fmt

---
 src/circuit_builder.rs | 32 +++++++++++++++++++++++---------
 src/generator.rs       |  2 +-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/circuit_builder.rs b/src/circuit_builder.rs
index 1ea9dd09..8df0fd8c 100644
--- a/src/circuit_builder.rs
+++ b/src/circuit_builder.rs
@@ -12,13 +12,13 @@ use crate::field::extension_field::Extendable;
 use crate::gates::constant::ConstantGate;
 use crate::gates::gate::{GateInstance, GateRef};
 use crate::gates::noop::NoopGate;
-use crate::generator::{CopyGenerator, WitnessGenerator, RandomValueGenerator};
+use crate::generator::{CopyGenerator, RandomValueGenerator, WitnessGenerator};
 use crate::hash::hash_n_to_hash;
 use crate::permutation_argument::TargetPartitions;
 use crate::polynomial::commitment::ListPolynomialCommitment;
 use crate::polynomial::polynomial::PolynomialValues;
 use crate::target::Target;
-use crate::util::{log2_strict, log2_ceil, transpose};
+use crate::util::{log2_ceil, log2_strict, transpose};
 use crate::wire::Wire;
 
 pub struct CircuitBuilder<F: Extendable<D>, const D: usize> {
@@ -205,9 +205,15 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 
     fn num_blinding_gates(&self, degree_estimate: usize) -> (usize, usize) {
         let fri_queries = self.config.fri_config.num_query_rounds;
-        let arities: Vec<usize> = self.config.fri_config.reduction_arity_bits.iter().map(|x| 1 << x).collect();
-        let total_fri_folding_points : usize = arities.iter().map(|x| x - 1).sum::<usize>();
-        let final_poly_coeffs : usize = degree_estimate >> arities.iter().sum::<usize>();
+        let arities: Vec<usize> = self
+            .config
+            .fri_config
+            .reduction_arity_bits
+            .iter()
+            .map(|x| 1 << x)
+            .collect();
+        let total_fri_folding_points: usize = arities.iter().map(|x| x - 1).sum::<usize>();
+        let final_poly_coeffs: usize = degree_estimate >> arities.iter().sum::<usize>();
         let fri_openings = fri_queries * (1 + total_fri_folding_points + final_poly_coeffs);
 
         let regular_poly_openings = D + fri_openings;
@@ -215,7 +221,6 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 
         (regular_poly_openings, z_openings)
     }
-    
 
     /// The number of polynomial values that will be revealed per opening.
     fn blinding_counts(&self) -> (usize, usize) {
@@ -260,11 +265,20 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 
             for w in 0..num_routed_wires {
                 self.add_generator(RandomValueGenerator {
-                    target: Target::Wire(Wire { gate: gate_1, input: w }),
+                    target: Target::Wire(Wire {
+                        gate: gate_1,
+                        input: w,
+                    }),
                 });
                 self.add_generator(CopyGenerator {
-                    src: Target::Wire(Wire { gate: gate_1, input: w }),
-                    dst: Target::Wire(Wire { gate: gate_2, input: w }),
+                    src: Target::Wire(Wire {
+                        gate: gate_1,
+                        input: w,
+                    }),
+                    dst: Target::Wire(Wire {
+                        gate: gate_2,
+                        input: w,
+                    }),
                 });
             }
         }
diff --git a/src/generator.rs b/src/generator.rs
index cbc659de..53fb0d42 100644
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -124,7 +124,7 @@ impl<F: Field> SimpleGenerator<F> for RandomValueGenerator {
 
     fn run_once(&self, _witness: &PartialWitness<F>) -> PartialWitness<F> {
         let random_value = F::rand();
-        
+
         PartialWitness::singleton_target(self.target, random_value)
     }
 }