Clippy

src/cli/backend.rs

@@ -4,7 +4,7 @@ use serde::Deserialize;
 
 use crate::field::LanguageField;
 
-#[derive(Clone, Default, Debug, Deserialize, ValueEnum, PartialEq)]
+#[derive(Clone, Default, Debug, Deserialize, ValueEnum, PartialEq, Eq)]
 pub enum Backend {
     #[default]
     Nova,

src/config.rs

@@ -74,7 +74,7 @@ pub fn home_dir() -> Utf8PathBuf {
         .expect("path contains invalid Unicode")
 }
 
-#[derive(Default, Debug, PartialEq)]
+#[derive(Default, Debug, PartialEq, Eq)]
 pub enum Flow {
     #[default]
     Sequential,
@@ -124,7 +124,7 @@ pub struct ParallelConfig {
 }
 
 /// Should we use optimized witness-generation when possible?
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Eq)]
 pub struct WitnessGeneration {
     // NOTE: Neptune itself *will* do this transparently at the level of individual hashes, where possible.
     // so this configuration is only required for higher-level decisions.
@@ -327,7 +327,6 @@ mod tests {
         let public_params_dir_dup = tmp_dir.join("public_params_dup").into_string();
 
         let mut config_file = File::create(config_dir.clone()).unwrap();
-        // The second entry should take priority
         config_file
             .write_all(format!("public_params_dir = \"{public_params_dir}\"\n").as_bytes())
             .unwrap();

src/public_parameters/mem_cache.rs

@@ -13,11 +13,13 @@ use crate::proof::MultiFrameTrait;
 use crate::{
     coprocessor::Coprocessor,
     proof::nova::{PublicParams, G1, G2},
-    public_parameters::disk_cache::public_params_dir,
 };
 use crate::{proof::nova::CurveCycleEquipped, public_parameters::error::Error};
 
-use super::{disk_cache::DiskCache, instance::Instance};
+use super::{
+    disk_cache::{public_params_dir, DiskCache},
+    instance::Instance,
+};
 
 type AnyMap = anymap::Map<dyn core::any::Any + Send + Sync>;
 type PublicParamMap<F, M> = HashMap<(usize, bool), Arc<PublicParams<F, M>>>;
@@ -53,7 +55,7 @@ impl PublicParamMemCache {
         <<G2<F> as Group>::Scalar as ff::PrimeField>::Repr: Abomonation,
     {
         // subdirectory search
-        let disk_cache = DiskCache::new(&public_params_dir()).unwrap();
+        let disk_cache = DiskCache::new(public_params_dir()).unwrap();
 
         // read the file if it exists, otherwise initialize
         if instance.abomonated {

src/public_parameters/mod.rs

@@ -57,7 +57,7 @@ where
 {
     let default =
         |instance: &Instance<'a, F, C, M>| nova::public_params(instance.rc, instance.lang());
-    let disk_cache = DiskCache::<F, C, M>::new(&public_params_dir()).unwrap();
+    let disk_cache = DiskCache::<F, C, M>::new(public_params_dir()).unwrap();
 
     let mut bytes = vec![];
     let pp = disk_cache.read_bytes(instance, &mut bytes).and_then(|()| {
@@ -95,7 +95,7 @@ where
     <<G1<F> as Group>::Scalar as ff::PrimeField>::Repr: Abomonation,
     <<G2<F> as Group>::Scalar as ff::PrimeField>::Repr: Abomonation,
 {
-    let disk_cache = DiskCache::<F, C, M>::new(&public_params_dir()).unwrap();
+    let disk_cache = DiskCache::<F, C, M>::new(public_params_dir()).unwrap();
 
     let mut bytes = vec![];
     disk_cache.read_bytes(instance, &mut bytes).and_then(|()| {
@@ -123,7 +123,7 @@ where
     <<G1<F> as Group>::Scalar as ff::PrimeField>::Repr: Abomonation,
     <<G2<F> as Group>::Scalar as ff::PrimeField>::Repr: Abomonation,
 {
-    let disk_cache = DiskCache::<F, C, M>::new(&public_params_dir()).unwrap();
+    let disk_cache = DiskCache::<F, C, M>::new(public_params_dir()).unwrap();
 
     let mut bytes = vec![];
     disk_cache.read_bytes(instance, &mut bytes).and_then(|()| {
@@ -159,7 +159,7 @@ where
     let default = |instance: &Instance<'a, F, C, M>| {
         supernova::public_params::<'a, F, C, M>(instance.rc, instance.lang())
     };
-    let disk_cache = DiskCache::<F, C, M>::new(&public_params_dir()).unwrap();
+    let disk_cache = DiskCache::<F, C, M>::new(public_params_dir()).unwrap();
 
     let maybe_circuit_params_vec = instance_primary
         .circuit_param_instances()