Merge pull request #37 from lichuang/lichuang_refactor

update tool chain version

Author: mergify[bot]

async-raft/src/core/admin.rs

@@ -165,8 +165,8 @@ impl<'a, D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>
 
         // TODO(xp): 111 test adding a node that is not non-voter.
         // TODO(xp): 111 test adding a node that is lagging.
-        for new_node in members.difference(&self.core.effective_membership.membership.get_ith_config(0).unwrap()) {
-            match self.nodes.get(&new_node) {
+        for new_node in members.difference(self.core.effective_membership.membership.get_ith_config(0).unwrap()) {
+            match self.nodes.get(new_node) {
                 // Node is ready to join.
                 Some(node) => {
                     if node.is_line_rate(&self.core.last_log_id, &self.core.config) {

async-raft/src/core/client.rs

@@ -296,7 +296,7 @@ impl<'a, D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>
     pub(super) async fn client_request_post_commit(&mut self, req: ClientRequestEntry<D, R>) {
         let entry = &req.entry;
 
-        let apply_res = self.apply_entry_to_state_machine(&entry).await;
+        let apply_res = self.apply_entry_to_state_machine(entry).await;
 
         self.send_response(entry, apply_res, req.tx).await;
 

async-raft/src/lib.rs

@@ -1,6 +1,5 @@
 #![doc = include_str!("../README.md")]
 #![feature(backtrace)]
-#![feature(bound_cloned)]
 
 pub mod config;
 mod core;

async-raft/src/raft.rs

@@ -759,6 +759,7 @@ impl Membership {
         Membership::new_single(btreeset! {id})
     }
 
+    #[must_use]
     pub fn to_final_config(&self) -> Self {
         assert!(!self.configs.is_empty());
 

async-raft/tests/add_remove_voter.rs

@@ -135,15 +135,15 @@ async fn wait_log(router: std::sync::Arc<fixtures::RaftRouter>, node_ids: &BTree
     for i in node_ids.iter() {
         router
             .wait_for_metrics(
-                &i,
+                i,
                 |x| x.last_log_index == want_log,
                 Some(timeout),
                 &format!("n{}.last_log_index -> {}", i, want_log),
             )
             .await?;
         router
             .wait_for_metrics(
-                &i,
+                i,
                 |x| x.last_applied == want_log,
                 Some(timeout),
                 &format!("n{}.last_applied -> {}", i, want_log),

async-raft/tests/concurrent_write_and_add_non_voter.rs

@@ -143,15 +143,15 @@ async fn wait_log(
     for i in node_ids.iter() {
         router
             .wait_for_metrics(
-                &i,
+                i,
                 |x| x.last_log_index == want_log,
                 Some(timeout),
                 &format!("n{}.last_log_index -> {}", i, want_log),
             )
             .await?;
         router
             .wait_for_metrics(
-                &i,
+                i,
                 |x| x.last_applied == want_log,
                 Some(timeout),
                 &format!("n{}.last_applied -> {}", i, want_log),

async-raft/tests/membership/t30_commit_joint_config.rs

@@ -26,15 +26,13 @@ async fn commit_joint_config_during_0_to_012() -> Result<()> {
     let router = Arc::new(RaftRouter::new(config.clone()));
     router.new_raft_node(0).await;
 
-    // Assert all nodes are in non-voter state & have no entries.
-    let want;
-
     // router.assert_pristine_cluster().await;
 
     // Initialize the cluster, then assert that a stable cluster was formed & held.
     tracing::info!("--- initializing cluster");
     router.initialize_from_single_node(0).await?;
-    want = 1;
+    // Assert all nodes are in non-voter state & have no entries.
+    let want = 1;
 
     router.wait_for_log(&btreeset![0], want, None, "init node 0").await?;
 

async-raft/tests/membership/t40_removed_follower.rs

@@ -50,7 +50,7 @@ async fn stop_replication_to_removed_follower() -> Result<()> {
 
         for i in &[0, 3, 4] {
             router
-                .wait(&i, timeout())
+                .wait(i, timeout())
                 .await?
                 .metrics(|x| x.last_applied >= n_logs, "new cluster recv new logs")
                 .await?;
@@ -59,7 +59,7 @@ async fn stop_replication_to_removed_follower() -> Result<()> {
 
     for i in &[1, 2] {
         router
-            .wait(&i, timeout())
+            .wait(i, timeout())
             .await?
             .metrics(|x| x.last_applied < n_logs, "old cluster does not recv new logs")
             .await?;

memstore/src/lib.rs

@@ -1,6 +1,5 @@
 #![doc = include_str!("../README.md")]
 #![feature(backtrace)]
-#![feature(bound_cloned)]
 
 #[cfg(test)]
 mod test;

rust-toolchain

@@ -1 +1 @@
-nightly-2021-06-01
+nightly-2021-12-30