chore(deps): bump event-listener from 2.5.3 to 5.3.0

Bumps [event-listener](https://github.com/smol-rs/event-listener) from 2.5.3 to 5.3.0. - [Release notes](https://github.com/smol-rs/event-listener/releases) - [Changelog](https://github.com/smol-rs/event-listener/blob/master/CHANGELOG.md) - [Commits](smol-rs/event-listener@v2.5.3...v5.3.0) --- updated-dependencies: - dependency-name: event-listener dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
xline-kv · May 9, 2024 · 90f20d5 · 90f20d5
1 parent 0d3a250
commit 90f20d5
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/curp/Cargo.toml b/crates/curp/Cargo.toml
@@ -22,7 +22,7 @@ curp-test-utils = { path = "../curp-test-utils" }
 dashmap = "5.5.0"
 derive_builder = "0.20.0"
 engine = { path = "../engine" }
-event-listener = "2.5.2"
+event-listener = "5.3.0"
 flume = "0.11.0"
 fs2 = "0.4.3"
 futures = "0.3.21"

diff --git a/crates/curp/src/client/state.rs b/crates/curp/src/client/state.rs
@@ -201,15 +201,15 @@ impl State {
                     info!("client term updates to {term}, client leader id updates to {new_leader_id}");
                     state.term = term;
                     state.leader = Some(new_leader_id);
-                    self.immutable.leader_notifier.notify(usize::MAX);
+                    let _ignore = self.immutable.leader_notifier.notify(usize::MAX);
                 }
             }
             Ordering::Equal => {
                 if let Some(new_leader_id) = leader_id {
                     if state.leader.is_none() {
                         info!("client leader id updates to {new_leader_id}");
                         state.leader = Some(new_leader_id);
-                        self.immutable.leader_notifier.notify(usize::MAX);
+                        let _ignore = self.immutable.leader_notifier.notify(usize::MAX);
                     }
                     assert_eq!(
                         state.leader,

diff --git a/crates/curp/src/server/cmd_board.rs b/crates/curp/src/server/cmd_board.rs
@@ -48,12 +48,12 @@ impl<C: Command> CommandBoard<C> {
 
     /// Release notifiers
     pub(super) fn release_notifiers(&mut self) {
-        self.er_notifiers
-            .drain()
-            .for_each(|(_, event)| event.notify(usize::MAX));
-        self.asr_notifiers
-            .drain()
-            .for_each(|(_, event)| event.notify(usize::MAX));
+        self.er_notifiers.drain().for_each(|(_, event)| {
+            let _ignore = event.notify(usize::MAX);
+        });
+        self.asr_notifiers.drain().for_each(|(_, event)| {
+            let _ignore = event.notify(usize::MAX);
+        });
     }
 
     /// Clear
@@ -104,7 +104,7 @@ impl<C: Command> CommandBoard<C> {
         let event = self.er_notifiers.entry(id).or_default();
         let listener = event.listen();
         if self.er_buffer.contains_key(&id) {
-            event.notify(usize::MAX);
+            let _ignore = event.notify(usize::MAX);
         }
         listener
     }
@@ -119,7 +119,7 @@ impl<C: Command> CommandBoard<C> {
         let event = self.asr_notifiers.entry(id).or_default();
         let listener = event.listen();
         if self.asr_buffer.contains_key(&id) {
-            event.notify(usize::MAX);
+            let _ignore = event.notify(usize::MAX);
         }
         listener
     }
@@ -129,34 +129,34 @@ impl<C: Command> CommandBoard<C> {
         let event = self.conf_notifier.entry(id).or_default();
         let listener = event.listen();
         if self.conf_buffer.contains(&id) {
-            event.notify(usize::MAX);
+            let _ignore = event.notify(usize::MAX);
         }
         listener
     }
 
     /// Notify execution results
     fn notify_er(&mut self, id: &ProposeId) {
         if let Some(notifier) = self.er_notifiers.remove(id) {
-            notifier.notify(usize::MAX);
+            let _ignore = notifier.notify(usize::MAX);
         }
     }
 
     /// Notify `wait_synced` requests
     fn notify_asr(&mut self, id: &ProposeId) {
         if let Some(notifier) = self.asr_notifiers.remove(id) {
-            notifier.notify(usize::MAX);
+            let _ignore = notifier.notify(usize::MAX);
         }
     }
 
     /// Notify `shutdown` requests
     pub(super) fn notify_shutdown(&mut self) {
-        self.shutdown_notifier.notify(usize::MAX);
+        let _ignore = self.shutdown_notifier.notify(usize::MAX);
     }
 
     /// Notify `wait_synced` requests
     fn notify_conf(&mut self, id: &ProposeId) {
         if let Some(notifier) = self.conf_notifier.remove(id) {
-            notifier.notify(usize::MAX);
+            let _ignore = notifier.notify(usize::MAX);
         }
     }
 

diff --git a/crates/curp/src/server/curp_node.rs b/crates/curp/src/server/curp_node.rs
@@ -492,7 +492,7 @@ impl<C: Command, RC: RoleChange> CurpNode<C, RC> {
                             change.node_id
                         );
                     };
-                    event.notify(1);
+                    let _ignore = event.notify(1);
                 }
                 ConfChangeType::Update => {
                     if let Err(e) = curp.update_connect(change.node_id, change.address).await {

diff --git a/crates/curp/src/server/raw_curp/mod.rs b/crates/curp/src/server/raw_curp/mod.rs
@@ -899,6 +899,7 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
     /// Handle `vote` responses
     /// Return `Ok(election_ends)` if succeeds
     /// Return `Err(())` if self is no longer a candidate
+    #[allow(clippy::shadow_unrelated)] // allow reuse the `_ignore` variable name.
     pub(super) fn handle_vote_resp(
         &self,
         id: ServerId,
@@ -916,7 +917,7 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
         }
 
         let mut cst_w = self.cst.lock();
-        let _ig = cst_w.votes_received.insert(id, vote_granted);
+        let _ignore = cst_w.votes_received.insert(id, vote_granted);
 
         if !vote_granted {
             return Ok(false);
@@ -954,10 +955,9 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
         }
         if prev_last_log_index < last_log_index {
             // if some entries are recovered, sync with followers immediately
-            self.ctx
-                .sync_events
-                .iter()
-                .for_each(|event| event.notify(1));
+            self.ctx.sync_events.iter().for_each(|event| {
+                let _ignore = event.notify(1);
+            });
         }
 
         Ok(true)
@@ -1098,7 +1098,7 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
         if match_index == self.log.read().last_log_index() {
             Ok(true)
         } else {
-            self.sync_event(target_id).notify(1);
+            let _ignore = self.sync_event(target_id).notify(1);
             Ok(false)
         }
     }
@@ -1613,7 +1613,7 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
         st.role = Role::Leader;
         st.leader_id = Some(self.id());
         let _ig = self.ctx.leader_tx.send(Some(self.id())).ok();
-        self.ctx.leader_event.notify(usize::MAX);
+        let _ignore = self.ctx.leader_event.notify(usize::MAX);
         self.ctx.role_change.on_election_win();
         debug!("{} becomes the leader", self.id());
     }
@@ -1882,7 +1882,7 @@ impl<C: Command, RC: RoleChange> RawCurp<C, RC> {
         self.ctx.sync_events.iter().for_each(|e| {
             if let Some(next) = self.lst.get_next_index(*e.key()) {
                 if next > log_w.base_index && log_w.has_next_batch(next) {
-                    e.notify(1);
+                    let _ignore = e.notify(1);
                 }
             }
         });

diff --git a/crates/xline/Cargo.toml b/crates/xline/Cargo.toml
@@ -25,7 +25,7 @@ curp = { path = "../curp", version = "0.1.0", features = ["client-metrics"] }
 curp-external-api = { path = "../curp-external-api" }
 dashmap = "5.5.3"
 engine = { path = "../engine" }
-event-listener = "2.5.2"
+event-listener = "5.3.0"
 futures = "0.3.25"
 hyper = "0.14.27"
 itertools = "0.11"

diff --git a/crates/xline/src/conflict/tests.rs b/crates/xline/src/conflict/tests.rs
@@ -8,13 +8,12 @@ use xlineapi::{
     LeaseRevokeRequest, PutRequest, RequestWrapper,
 };
 
+use super::spec_pool::{KvSpecPool, LeaseSpecPool};
 use crate::conflict::{
     spec_pool::ExclusiveSpecPool,
     uncommitted_pool::{ExclusiveUncomPool, KvUncomPool, LeaseUncomPool},
 };
 
-use super::spec_pool::{KvSpecPool, LeaseSpecPool};
-
 #[test]
 fn kv_sp_operations_are_ok() {
     let mut sp = KvSpecPool::default();

diff --git a/crates/xline/src/server/barriers.rs b/crates/xline/src/server/barriers.rs
@@ -44,7 +44,7 @@ impl IndexBarrier {
         let mut split_barriers = inner_l.barriers.split_off(&(index.overflow_add(1)));
         std::mem::swap(&mut inner_l.barriers, &mut split_barriers);
         for (_, barrier) in split_barriers {
-            barrier.notify(usize::MAX);
+            let _ignore = barrier.notify(usize::MAX);
         }
     }
 }
@@ -82,7 +82,7 @@ impl IdBarrier {
     /// Trigger the barrier of the given inflight id.
     pub(crate) fn trigger(&self, id: InflightId) {
         if let Some(event) = self.barriers.lock().remove(&id) {
-            event.notify(usize::MAX);
+            let _ignore = event.notify(usize::MAX);
         }
     }
 }

diff --git a/crates/xline/src/server/command.rs b/crates/xline/src/server/command.rs
@@ -356,14 +356,14 @@ where
         if let RequestWrapper::CompactionRequest(ref compact_req) = *wrapper {
             if compact_req.physical {
                 if let Some(n) = self.compact_events.get(&cmd.compact_id()) {
-                    n.notify(usize::MAX);
+                    let _ignore = n.notify(usize::MAX);
                 }
             }
         };
         if let RequestWrapper::CompactionRequest(ref compact_req) = *wrapper {
             if compact_req.physical {
                 if let Some(n) = self.compact_events.get(&cmd.compact_id()) {
-                    n.notify(usize::MAX);
+                    let _ignore = n.notify(usize::MAX);
                 }
             }
         };

diff --git a/crates/xline/src/server/watch_server.rs b/crates/xline/src/server/watch_server.rs
@@ -211,7 +211,7 @@ where
                 req.watch_id
             )));
             if self.response_tx.send(result).await.is_err() {
-                self.stop_notify.notify(1);
+                let _ignore = self.stop_notify.notify(1);
             }
             return;
         };
@@ -249,7 +249,7 @@ where
             ..WatchResponse::default()
         };
         if self.response_tx.send(Ok(response)).await.is_err() {
-            self.stop_notify.notify(1);
+            let _ignore = self.stop_notify.notify(1);
         }
     }
 
@@ -273,7 +273,7 @@ where
             )))
         };
         if self.response_tx.send(result).await.is_err() {
-            self.stop_notify.notify(1);
+            let _ignore = self.stop_notify.notify(1);
         }
     }
 
@@ -329,7 +329,7 @@ where
         };
 
         if self.response_tx.send(Ok(response)).await.is_err() {
-            self.stop_notify.notify(1);
+            let _ignore = self.stop_notify.notify(1);
         }
         if let Some(progress) = self.progress.get_mut(&watch_id) {
             *progress = false;
@@ -348,7 +348,7 @@ where
             .await
             .is_err()
         {
-            self.stop_notify.notify(1);
+            let _ignore = self.stop_notify.notify(1);
         }
     }
 
@@ -366,7 +366,7 @@ where
                     .await
                     .is_err()
                 {
-                    self.stop_notify.notify(1);
+                    let _ignore = self.stop_notify.notify(1);
                 }
             } else {
                 *progress = true;

diff --git a/crates/xline/src/storage/compact/mod.rs b/crates/xline/src/storage/compact/mod.rs
@@ -134,7 +134,7 @@ pub(crate) async fn compact_bg_task<DB>(
             panic!("failed to set finished compact revision {revision:?} due to {e}");
         }
         if let Some(notifier) = listener {
-            notifier.notify(usize::MAX);
+            let _ignore = notifier.notify(usize::MAX);
         }
     }
 }
diff --git a/crates/xline/src/storage/kvwatcher.rs b/crates/xline/src/storage/kvwatcher.rs
@@ -154,7 +154,7 @@ impl Watcher {
             }
             Err(TrySendError::Closed(_)) => {
                 warn!(watch_id, revision, "watcher is closed");
-                self.stop_notify.notify(1);
+                let _ignore = self.stop_notify.notify(1);
                 Ok(())
             }
             Err(TrySendError::Full(watch_event)) => {

diff --git a/crates/xline/src/storage/lease_store/mod.rs b/crates/xline/src/storage/lease_store/mod.rs
@@ -179,7 +179,7 @@ where
         };
 
         _ = self.unsynced_cache.write().remove(&lease_id);
-        self.sync_event.notify(usize::MAX);
+        let _ignore = self.sync_event.notify(usize::MAX);
     }
 
     /// Wait for the lease id to be removed from the cache