feat: implement entry for BTreeMap similar to std lib

benchmarks/btreemap/src/main.rs

@@ -1,6 +1,7 @@
 use benchmarks::{random::Random, vec::UnboundedVecN};
 use canbench_rs::{bench, bench_fn, BenchResult};
 use candid::Principal;
+use ic_stable_structures::btreemap::entry::Entry::Occupied;
 use ic_stable_structures::memory_manager::{MemoryId, MemoryManager};
 use ic_stable_structures::{storable::Blob, BTreeMap, DefaultMemoryImpl, Memory, Storable};
 use std::ops::Bound;
@@ -396,6 +397,45 @@ pub fn btreemap_v2_get_10mib_values() -> BenchResult {
     })
 }
 
+#[bench(raw)]
+pub fn btreemap_get_and_incr() -> BenchResult {
+    let count = 10000;
+    let mut btree = BTreeMap::new(DefaultMemoryImpl::default());
+    let mut rng = Rng::from_seed(0);
+    let values = generate_random_kv::<u64, u64>(count, &mut rng);
+    for (key, value) in values.iter().copied() {
+        btree.insert(key, value);
+    }
+
+    bench_fn(|| {
+        for (key, _) in values {
+            let existing = btree.get(&key).unwrap();
+            btree.insert(key, existing + 1);
+        }
+    })
+}
+
+#[bench(raw)]
+pub fn btreemap_get_and_incr_via_entry() -> BenchResult {
+    let count = 10000;
+    let mut btree = BTreeMap::new(DefaultMemoryImpl::default());
+    let mut rng = Rng::from_seed(0);
+    let values = generate_random_kv::<u64, u64>(count, &mut rng);
+    for (key, value) in values.iter().copied() {
+        btree.insert(key, value);
+    }
+
+    bench_fn(|| {
+        for (key, _) in values {
+            let Occupied(e) = btree.entry(key) else {
+                panic!()
+            };
+            let existing = e.get();
+            e.insert(existing + 1);
+        }
+    })
+}
+
 // Benchmarks for `BTreeMap::contains_key`.
 bench_tests! {
     // blob K x 128

benchmarks/nns/src/nns_vote_cascading/tests.rs

@@ -168,7 +168,7 @@ fn set_up_worst_case<NS: NeuronStore>(
     for neuron_id in num_followees..num_neurons {
         let previous_neuron_ids = (neuron_id - num_half_followees - 1)..neuron_id;
         let followee_neuron_ids = previous_neuron_ids
-            .map(|id| NeuronId::from(id))
+            .map(NeuronId::from)
             .chain(not_voting_neuron_ids.clone().into_iter())
             .collect::<Vec<_>>();
         neuron_store.set_followees(