refactor: removing unnecessary flags and fixing linting issues

Author: Sahilgill24

crates/whir/Cargo.toml

@@ -43,6 +43,6 @@ nightly-features = [
   "transcript/nightly-features",
   "witness/nightly-features",
 ]
-parallel = ["p3-maybe-rayon/parallel","dep:rayon"]
+parallel = ["p3-maybe-rayon/parallel", "dep:rayon"]
 print-trace = ["tracing/log"]
 rayon = ["dep:rayon"]

crates/whir/src/ntt/mod.rs

@@ -9,12 +9,11 @@ mod wavelet;
 
 use self::matrix::MatrixMut;
 
-#[cfg(feature = "parallel")]
-use p3::maybe_rayon::prelude::*;
 use p3::{
     dft::{Radix2DitParallel, TwoAdicSubgroupDft},
     field::TwoAdicField,
     matrix::Matrix,
+    maybe_rayon::prelude::*,
 };
 use tracing::instrument;
 use witness::{InstancePaddingStrategy, RowMajorMatrix};

crates/whir/src/ntt/ntt_impl.rs

@@ -14,16 +14,15 @@ use p3::{
         Matrix,
         dense::{DenseMatrix, RowMajorMatrix},
     },
+    maybe_rayon::prelude::*,
 };
 use std::{
     any::{Any, TypeId},
+    cmp::max,
     collections::HashMap,
     sync::{Arc, LazyLock, Mutex, RwLock, RwLockReadGuard},
 };
 
-#[cfg(feature = "parallel")]
-use {rayon::prelude::*, std::cmp::max};
-
 /// Global cache for NTT engines, indexed by field.
 // TODO: Skip `LazyLock` when `HashMap::with_hasher` becomes const.
 // see https://github.com/rust-lang/rust/issues/102575

crates/whir/src/ntt/transpose.rs

@@ -7,8 +7,6 @@ use p3::{
     matrix::{Matrix, dense::RowMajorMatrix},
     maybe_rayon::prelude::*,
 };
-#[cfg(feature = "parallel")]
-use rayon::join;
 use sumcheck::macros::{entered_span, exit_span};
 
 // NOTE: The assumption that rows and cols are a power of two are actually only relevant for the square matrix case.

crates/whir/src/ntt/wavelet.rs

@@ -2,7 +2,6 @@ use super::{transpose, utils::workload_size};
 use p3::field::Field;
 use std::cmp::max;
 
-#[cfg(feature = "parallel")]
 use p3::maybe_rayon::prelude::*;
 
 /// Fast Wavelet Transform.

crates/whir/src/sumcheck/prover_batched.rs

@@ -2,8 +2,6 @@ use super::proof::SumcheckPolynomial;
 use crate::sumcheck::prover_single::SumcheckSingle;
 use ff_ext::ExtensionField;
 use p3::{field::Field, maybe_rayon::prelude::*, util::log2_strict_usize};
-#[cfg(feature = "parallel")]
-use rayon::join;
 
 pub struct SumcheckBatched<F: ExtensionField> {
     // The evaluation on each p and eq

crates/whir/src/sumcheck/prover_single.rs

@@ -1,9 +1,9 @@
 use super::proof::SumcheckPolynomial;
 
 use ff_ext::ExtensionField;
-use p3::{maybe_rayon::prelude::*, util::log2_strict_usize};
 #[cfg(feature = "parallel")]
-use rayon::join;
+use p3::maybe_rayon::prelude::join;
+use p3::{maybe_rayon::prelude::*, util::log2_strict_usize};
 
 pub struct SumcheckSingle<E: ExtensionField> {
     // The evaluation of p
@@ -261,10 +261,12 @@ mod tests {
 
         let eval = MultilinearExtension::from_evaluations_ext_vec(2, polynomial.clone())
             .evaluate(&eval_point);
-        let mut prover =
-            SumcheckSingle::new(polynomial, &[eval_point], &[E::from_canonical_u64(1)], &[
-                eval,
-            ]);
+        let mut prover = SumcheckSingle::new(
+            polynomial,
+            &[eval_point],
+            &[E::from_canonical_u64(1)],
+            &[eval],
+        );
 
         let poly_1 = prover.compute_sumcheck_polynomial();
 

crates/whir/src/whir/batch/committer.rs

@@ -13,14 +13,12 @@ use derive_more::Debug;
 use ff_ext::ExtensionField;
 use p3::{
     matrix::{Matrix, dense::RowMajorMatrix},
+    maybe_rayon::prelude::*,
     util::log2_strict_usize,
 };
 use sumcheck::macros::{entered_span, exit_span};
 use transcript::{BasicTranscript, Transcript};
 
-#[cfg(feature = "parallel")]
-use p3::maybe_rayon::prelude::*;
-
 #[derive(Debug)]
 pub struct Witnesses<E: ExtensionField> {
     pub(crate) polys: Vec<Vec<E::BaseField>>,

crates/whir/src/whir/batch/prover.rs

@@ -21,13 +21,11 @@ use crate::{
 use ff_ext::{ExtensionField, PoseidonField};
 use itertools::zip_eq;
 use multilinear_extensions::mle::{FieldType, MultilinearExtension};
-use p3::{commit::Mmcs, matrix::dense::RowMajorMatrix};
+use p3::{commit::Mmcs, matrix::dense::RowMajorMatrix, maybe_rayon::prelude::*};
 use sumcheck::macros::{entered_span, exit_span};
 use transcript::Transcript;
 
 use crate::whir::fs_utils::get_challenge_stir_queries;
-#[cfg(feature = "parallel")]
-use p3::maybe_rayon::prelude::*;
 
 struct RoundStateBatch<'a, E: ExtensionField> {
     round_state: RoundState<'a, E>,

crates/whir/src/whir/fold.rs

@@ -3,11 +3,10 @@ use crate::{
     parameters::FoldType,
 };
 
-#[cfg(feature = "parallel")]
-use p3::maybe_rayon::prelude::*;
 use p3::{
     field::{Field, TwoAdicField},
     matrix::Matrix,
+    maybe_rayon::prelude::*,
 };
 
 /// Given the evaluation of f on the coset specified by coset_offset * <coset_gen>