fix(ci): Update Rust version and fix CI

.github/workflows/build-and-test.yml

@@ -2,8 +2,8 @@ name: Build and Test
 on: push
 
 env:
-  RUST_VERSION: 1.70.0
-  NIGHTLY_VERSION: nightly-2023-05-31
+  RUST_VERSION: 1.76.0
+  NIGHTLY_VERSION: nightly-2024-02-04
   CARGO_VET_VERSION: 0.7.0
   CARGO_VET_REPO: https://github.com/mozilla/cargo-vet
 

crates/semaphore-depth-macros/src/lib.rs

@@ -27,13 +27,13 @@
 ///     assert!(depth > 0);
 /// }
 ///
 /// #[test]
 /// fn test_depth_non_zero_depth_16() {
 ///     test_depth_non_zero(16);
 /// }
 ///
 /// #[test]
 /// fn test_depth_non_zero_depth_30() {
 ///     test_depth_non_zero(30);
 /// }
 /// ```
@@ -101,8 +101,8 @@
                 }
             }
             syn::Expr::Macro(mcr) => {
-                let Ok(mut args) =  mcr.mac.parse_body::<MacroArgs>() else {
-                     return;
+                let Ok(mut args) = mcr.mac.parse_body::<MacroArgs>() else {
+                    return;
                 };
                 for arg in &mut args.args {
                     self.visit_expr_mut(arg);

src/lazy_merkle_tree.rs

@@ -83,13 +83,13 @@
     /// Creates a new memory mapped file specified by path and creates a tree
     /// with dense prefix of the given depth with initial values
     #[must_use]
     pub fn new_mmapped_with_dense_prefix_with_init_values(
         depth: usize,
         prefix_depth: usize,
         empty_value: &H::Hash,
         initial_values: &[H::Hash],
         file_path: &str,
     ) -> Result<LazyMerkleTree<H, Canonical>, DenseMMapError> {
         Ok(LazyMerkleTree {
             tree:     AnyTree::new_mmapped_with_dense_prefix_with_init_values(
                 depth,
@@ -559,8 +559,8 @@
     fn from(children: Children<H>) -> Self {
         assert_eq!(children.left.depth(), children.right.depth());
         let (depth, root) = {
             let left = children.left.clone();
             let right = children.right.clone();
             let depth = left.depth() + 1;
             let root = H::hash_node(&left.root(), &right.root());
             (depth, root)
@@ -708,7 +708,7 @@
     where
         F: FnOnce(DenseTreeRef<H>) -> R,
     {
         let guard = self.storage.lock().expect("lock poisoned, terminating");
         let r = DenseTreeRef {
             depth:          self.depth,
             root_index:     self.root_index,
@@ -744,7 +744,7 @@
     }
 
     fn update_with_mutation(&self, index: usize, value: &H::Hash) {
         let mut storage = self.storage.lock().expect("lock poisoned, terminating");
         let leaf_index_in_dense_tree = index + (self.root_index << self.depth);
         storage[leaf_index_in_dense_tree] = value.clone();
         let mut current = leaf_index_in_dense_tree / 2;
@@ -945,7 +945,7 @@
     where
         F: FnOnce(DenseTreeMMapRef<H>) -> R,
     {
         let guard = self.storage.lock().expect("lock poisoned, terminating");
         let r = DenseTreeMMapRef {
             depth:          self.depth,
             root_index:     self.root_index,
@@ -981,7 +981,7 @@
     }
 
     fn update_with_mutation(&self, index: usize, value: &H::Hash) {
         let mut storage = self.storage.lock().expect("lock poisoned, terminating");
         let leaf_index_in_dense_tree = index + (self.root_index << self.depth);
         storage[leaf_index_in_dense_tree] = value.clone();
         let mut current = leaf_index_in_dense_tree / 2;
@@ -1149,7 +1149,7 @@
         };
 
         file.set_len(file_size).expect("cannot set file size");
-        if file.write_all(&buf).is_err() {
+        if file.write_all(buf).is_err() {
             return Err(DenseMMapError::FileCannotWriteBytes);
         }
 

src/lib.rs

@@ -145,8 +145,11 @@ mod test {
 #[cfg(feature = "bench")]
 pub mod bench {
     use crate::{
-        hash_to_field, identity::Identity, poseidon_tree::LazyPoseidonTree,
-        protocol::{generate_proof, generate_witness}, Field,
+        hash_to_field,
+        identity::Identity,
+        poseidon_tree::LazyPoseidonTree,
+        protocol::{generate_proof, generate_witness},
+        Field,
     };
     use criterion::Criterion;
     use semaphore_depth_config::get_supported_depths;
@@ -182,18 +185,18 @@ pub mod bench {
 
     fn bench_witness(criterion: &mut Criterion, depth: usize) {
         let leaf = Field::from(0);
-    
+
         // Create tree
         let mut hello = *b"hello";
         let id = Identity::from_secret(&mut hello, None);
         let mut tree = LazyPoseidonTree::new(depth, leaf).derived();
         tree = tree.update(0, &id.commitment());
         let merkle_proof = tree.proof(0);
-    
+
         // change signal and external_nullifier here
         let signal_hash = hash_to_field(b"xxx");
         let external_nullifier_hash = hash_to_field(b"appId");
-    
+
         criterion.bench_function(&format!("witness_{depth}"), move |b| {
             b.iter(|| {
                 generate_witness(&id, &merkle_proof, external_nullifier_hash, signal_hash).unwrap();