Merge pull request #42 from eval-exec/exec/upgrade-rust-2024

Rust Toolchain: Upgrade to rust edition 2024

Cargo.toml

@@ -2,8 +2,8 @@
 name = "ckb-merkle-mountain-range"
 version = "0.6.1"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
-edition = "2018"
-rust-version = "1.60.0"
+edition = "2024"
+rust-version = "1.85.0"
 license = "MIT"
 description = "A generalized merkle mountain range implementation"
 repository = "https://github.com/nervosnetwork/merkle-mountain-range"

benches/helper_benchmark.rs

@@ -4,7 +4,7 @@ use criterion::Criterion;
 
 use ckb_merkle_mountain_range::{leaf_index_to_mmr_size, leaf_index_to_pos};
 
-use rand::{thread_rng, Rng};
+use rand::{Rng, thread_rng};
 
 fn bench(c: &mut Criterion) {
     c.bench_function("left_index_to_pos", |b| {

benches/mmr_benchmark.rs

@@ -4,7 +4,7 @@ extern crate criterion;
 use criterion::{BenchmarkId, Criterion};
 
 use bytes::Bytes;
-use ckb_merkle_mountain_range::{util::MemStore, Error, MMRStoreReadOps, Merge, Result, MMR};
+use ckb_merkle_mountain_range::{Error, MMR, MMRStoreReadOps, Merge, Result, util::MemStore};
 use rand::{seq::SliceRandom, thread_rng};
 use std::convert::TryFrom;
 

src/lib.rs

@@ -12,7 +12,7 @@ pub mod util;
 pub use error::{Error, Result};
 pub use helper::{leaf_index_to_mmr_size, leaf_index_to_pos};
 pub use merge::Merge;
-pub use mmr::{MerkleProof, MMR};
+pub use mmr::{MMR, MerkleProof};
 pub use mmr_store::{MMRStoreReadOps, MMRStoreWriteOps};
 
 cfg_if::cfg_if! {

src/mmr.rs

@@ -16,6 +16,7 @@ use crate::vec::Vec;
 use crate::{Error, Merge, Result};
 use core::fmt::Debug;
 use core::marker::PhantomData;
+use core::mem;
 
 #[allow(clippy::upper_case_acronyms)]
 pub struct MMR<T, M, S> {
@@ -498,5 +499,5 @@ fn take_while_vec<T, P: Fn(&T) -> bool>(v: &mut Vec<T>, p: P) -> Vec<T> {
             return v.drain(..i).collect();
         }
     }
-    v.drain(..).collect()
+    mem::take(v)
 }

src/mmr_store.rs

@@ -1,4 +1,4 @@
-use crate::{vec::Vec, Result};
+use crate::{Result, vec::Vec};
 
 #[derive(Default)]
 pub struct MMRBatch<Elem, Store> {

src/tests/test_accumulate_headers.rs

@@ -1,5 +1,5 @@
 use super::new_blake2b;
-use crate::{leaf_index_to_pos, util::MemStore, MMRStoreReadOps, Merge, MerkleProof, Result, MMR};
+use crate::{MMR, MMRStoreReadOps, Merge, MerkleProof, Result, leaf_index_to_pos, util::MemStore};
 use bytes::{Bytes, BytesMut};
 use std::fmt;
 

src/tests/test_helper.rs

@@ -1,9 +1,9 @@
 use super::{MergeNumberHash, NumberHash};
 use crate::{
+    MMR,
     helper::{get_peak_map, get_peaks, pos_height_in_tree},
     leaf_index_to_mmr_size, leaf_index_to_pos,
     util::MemStore,
-    MMR,
 };
 use lazy_static::lazy_static;
 use proptest::prelude::*;

src/tests/test_mmr.rs

@@ -1,9 +1,9 @@
 use super::{MergeNumberHash, NumberHash};
 use crate::{
+    Error,
     helper::pos_height_in_tree,
     leaf_index_to_mmr_size,
     util::{MemMMR, MemStore},
-    Error,
 };
 use faster_hex::hex_string;
 use proptest::prelude::*;
@@ -234,9 +234,11 @@ fn test_invalid_proof_verification(
         }
         Err(Error::NodeProofsNotSupported) => {
             // if couldn't generate proof, then it contained a non-leaf
-            assert!(positions_to_verify
-                .iter()
-                .any(|pos| pos_height_in_tree(*pos) > 0));
+            assert!(
+                positions_to_verify
+                    .iter()
+                    .any(|pos| pos_height_in_tree(*pos) > 0)
+            );
         }
         Err(e) => panic!("Unexpected error: {}", e),
     }

src/tests/test_sequence.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use proptest::proptest;
 use rand::{prelude::*, thread_rng};
 
-use crate::{util::MemStore, Merge, Result, MMR};
+use crate::{MMR, Merge, Result, util::MemStore};
 
 #[derive(Eq, PartialEq, Clone, Default)]
 struct NumberRange {

src/util.rs

@@ -1,5 +1,5 @@
 use crate::collections::BTreeMap;
-use crate::{vec::Vec, MMRStoreReadOps, MMRStoreWriteOps, Result, MMR};
+use crate::{MMR, MMRStoreReadOps, MMRStoreWriteOps, Result, vec::Vec};
 use core::cell::RefCell;
 
 #[derive(Clone)]