From 529add1c0aae0baca0e150777ae774c6a0814d9c Mon Sep 17 00:00:00 2001
From: Sebastien La Duca <sladuca777@gmail.com>
Date: Thu, 21 Jul 2022 17:01:21 -0400
Subject: [PATCH] switch rest of names back

---
 maybe_rayon/src/lib.rs      | 6 +++---
 plonky2/src/fri/oracle.rs   | 4 ++--
 plonky2/src/fri/prover.rs   | 2 +-
 plonky2/src/plonk/prover.rs | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maybe_rayon/src/lib.rs b/maybe_rayon/src/lib.rs
index 6f8dc7a1..7c7c685a 100644
--- a/maybe_rayon/src/lib.rs
+++ b/maybe_rayon/src/lib.rs
@@ -124,7 +124,7 @@ pub trait MaybeIntoParIter {
 	#[cfg(not(feature = "parallel"))]
 	type Iter: Iterator<Item = Self::Item>;
 
-	fn maybe_into_par_iter(self) -> Self::Iter;
+	fn into_par_iter(self) -> Self::Iter;
 }
 
 #[cfg(feature = "parallel")]
@@ -132,7 +132,7 @@ impl<T> MaybeIntoParIter for T where T: IntoParallelIterator {
 	type Item = T::Item;
 	type Iter = T::Iter;
 
-	fn maybe_into_par_iter(self) -> Self::Iter {
+	fn into_par_iter(self) -> Self::Iter {
 		self.into_par_iter()
 	}
 }
@@ -142,7 +142,7 @@ impl<T> MaybeIntoParIter for T where T: IntoIterator {
 	type Item = T::Item;
 	type Iter = T::IntoIter;
 
-	fn maybe_into_par_iter(self) -> Self::Iter {
+	fn into_par_iter(self) -> Self::Iter {
 		self.into_iter()
 	}
 }
diff --git a/plonky2/src/fri/oracle.rs b/plonky2/src/fri/oracle.rs
index da4e9e80..47647701 100644
--- a/plonky2/src/fri/oracle.rs
+++ b/plonky2/src/fri/oracle.rs
@@ -52,7 +52,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
         let coeffs = timed!(
             timing,
             "IFFT",
-            values.maybe_into_par_iter().map(|v| v.ifft()).collect::<Vec<_>>()
+            values.into_par_iter().map(|v| v.ifft()).collect::<Vec<_>>()
         );
 
         Self::from_coeffs(
@@ -122,7 +122,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
             })
             .chain(
                 (0..salt_size)
-                    .maybe_into_par_iter()
+                    .into_par_iter()
                     .map(|_| F::rand_vec(degree << rate_bits)),
             )
             .collect()
diff --git a/plonky2/src/fri/prover.rs b/plonky2/src/fri/prover.rs
index 0f3215a8..94389a7e 100644
--- a/plonky2/src/fri/prover.rs
+++ b/plonky2/src/fri/prover.rs
@@ -119,7 +119,7 @@ fn fri_proof_of_work<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, c
     config: &FriConfig,
 ) -> F {
     (0..=F::NEG_ONE.to_canonical_u64())
-        .maybe_into_par_iter()
+        .into_par_iter()
         .find_any(|&i| {
             C::InnerHasher::hash_no_pad(
                 &current_hash
diff --git a/plonky2/src/plonk/prover.rs b/plonky2/src/plonk/prover.rs
index 526721f0..9275e241 100644
--- a/plonky2/src/plonk/prover.rs
+++ b/plonky2/src/plonk/prover.rs
@@ -142,7 +142,7 @@ where
         timing,
         "split up quotient polys",
         quotient_polys
-            .maybe_into_par_iter()
+            .into_par_iter()
             .flat_map(|mut quotient_poly| {
                 quotient_poly.trim_to_len(quotient_degree).expect(
                     "Quotient has failed, the vanishing polynomial is not divisible by Z_H",
@@ -305,7 +305,7 @@ fn wires_permutation_partial_products_and_zs<
     }
 
     transpose(&all_partial_products_and_zs)
-        .maybe_into_par_iter()
+        .into_par_iter()
         .map(PolynomialValues::new)
         .collect()
 }
@@ -452,7 +452,7 @@ fn compute_quotient_polys<
         .collect();
 
     transpose(&quotient_values)
-        .maybe_into_par_iter()
+        .into_par_iter()
         .map(PolynomialValues::new)
         .map(|values| values.coset_ifft(F::coset_shift()))
         .collect()