Merge branch 'master' of https://github.com/pingcap/raft-rs into issu…

…e125_divide_progress_into_mods

Signed-off-by: Fullstop000 <fullstop1005@gmail.com>

# Conflicts:
#	src/progress/progress_set.rs
#	src/raft.rs

src/progress/mod.rs

@@ -233,4 +233,19 @@ impl Progress {
     pub fn pause(&mut self) {
         self.paused = true;
     }
+
+    /// Update inflight msgs and next_idx
+    pub fn update_state(&mut self, last: u64) {
+        match self.state {
+            ProgressState::Replicate => {
+                self.optimistic_update(last);
+                self.ins.add(last);
+            }
+            ProgressState::Probe => self.pause(),
+            ProgressState::Snapshot => panic!(
+                "updating progress state in unhandled state {:?}",
+                self.state
+            ),
+        }
+    }
 }

src/progress/progress_set.rs

@@ -654,7 +654,6 @@ impl ProgressSet {
     }
 }
 
-#[cfg(test)]
 mod test_progress_set {
     use super::{Configuration, ProgressSet, Result};
     use crate::progress::Progress;

src/raft.rs

@@ -38,7 +38,7 @@ use rand::{self, Rng};
 use super::errors::{Error, Result, StorageError};
 use super::progress::progress_set::{CandidacyStatus, Configuration, ProgressSet};
 use super::progress::{Progress, ProgressState};
-use super::raft_log::{self, RaftLog};
+use super::raft_log::RaftLog;
 use super::read_only::{ReadOnly, ReadOnlyOption, ReadState};
 use super::storage::Storage;
 use super::Config;