rebase cleanup

divviup · Sep 11, 2023 · 7112081 · 7112081
1 parent 0d6d6d7
commit 7112081
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,7 +58,7 @@ experimental = ["bitvec", "fiat-crypto", "fixed", "num-bigint", "num-rational",
 multithreaded = ["rayon"]
 prio2 = ["crypto-dependencies", "hmac", "sha2"]
 crypto-dependencies = ["aes", "ctr"]
-test-util = ["dep:rand"]
+test-util = ["rand"]
 
 [workspace]
 members = [".", "binaries"]

diff --git a/src/vdaf/poplar1.rs b/src/vdaf/poplar1.rs
@@ -329,6 +329,7 @@ impl<F: ConstantTimeEq> Eq for PrepareState<F> {}
 impl<F: ConstantTimeEq> ConstantTimeEq for PrepareState<F> {
     fn ct_eq(&self, other: &Self) -> Choice {
         self.sketch.ct_eq(&other.sketch) & self.output_share.ct_eq(&other.output_share)
+    }
 }
 
 impl<F> Debug for PrepareState<F> {

diff --git a/src/vdaf/prio3.rs b/src/vdaf/prio3.rs
@@ -970,6 +970,7 @@ impl<F: ConstantTimeEq, const SEED_SIZE: usize> ConstantTimeEq for Prio3PrepareS
             self.joint_rand_seed.as_ref(),
             other.joint_rand_seed.as_ref(),
         ) & self.measurement_share.ct_eq(&other.measurement_share)
+    }
 }
 
 impl<F, const SEED_SIZE: usize> Debug for Prio3PrepareState<F, SEED_SIZE> {