Merge branch 'fix-ci' into tianyuan/replication

Author: lance6716

proto/src/confchange.rs

@@ -71,7 +71,7 @@ pub trait ConfChangeI {
     fn into_v2(self) -> ConfChangeV2;
 
     /// Gets conf change as `ConfChangeV2`.
-    fn as_v2(&self) -> Cow<ConfChangeV2>;
+    fn as_v2(&self) -> Cow<'_, ConfChangeV2>;
 
     /// Converts conf change to `ConfChange`.
     ///
@@ -90,7 +90,7 @@ impl ConfChangeI for ConfChange {
     }
 
     #[inline]
-    fn as_v2(&self) -> Cow<ConfChangeV2> {
+    fn as_v2(&self) -> Cow<'_, ConfChangeV2> {
         Cow::Owned(self.clone().into_v2())
     }
 
@@ -107,7 +107,7 @@ impl ConfChangeI for ConfChangeV2 {
     }
 
     #[inline]
-    fn as_v2(&self) -> Cow<ConfChangeV2> {
+    fn as_v2(&self) -> Cow<'_, ConfChangeV2> {
         Cow::Borrowed(self)
     }
 

proto/src/lib.rs

@@ -3,6 +3,8 @@
 // We use `default` method a lot to be support prost and rust-protobuf at the
 // same time. And reassignment can be optimized by compiler.
 #![allow(clippy::field_reassign_with_default)]
+#![allow(mismatched_lifetime_syntaxes)]
+#![allow(unused_parens)]
 
 mod confchange;
 mod confstate;

src/confchange/changer.rs

@@ -45,7 +45,7 @@ pub struct Changer<'a> {
 
 impl Changer<'_> {
     /// Creates a changer.
-    pub fn new(tracker: &ProgressTracker) -> Changer {
+    pub fn new(tracker: &ProgressTracker) -> Changer<'_> {
         Changer { tracker }
     }
 
@@ -271,7 +271,7 @@ impl Changer<'_> {
     ///
     /// Unlike Etcd, we don't copy progress as we don't need to mutate the `is_learner`
     /// flags. Additions and Removals should be done after everything is checked OK.
-    fn check_and_copy(&self) -> Result<(Configuration, IncrChangeMap)> {
+    fn check_and_copy(&self) -> Result<(Configuration, IncrChangeMap<'_>)> {
         let prs = IncrChangeMap {
             changes: vec![],
             base: self.tracker.progress(),

src/errors.rs

@@ -144,8 +144,8 @@ mod tests {
             Error::ConfigInvalid(String::from("other error"))
         );
         assert_eq!(
-            Error::from(io::Error::new(io::ErrorKind::Other, "oh no!")),
-            Error::from(io::Error::new(io::ErrorKind::Other, "oh yes!"))
+            Error::from(io::Error::other("oh no!")),
+            Error::from(io::Error::other("oh yes!"))
         );
         assert_ne!(
             Error::StepPeerNotFound,

src/lib.rs

@@ -301,13 +301,13 @@ by one:
     }
     ```
 
-    Note, although Raft guarentees only persisted committed entries will be applied,
-    but it doesn't guarentee commit index is persisted before being applied. For example,
-    if application is restarted after applying committed entries before persisting
-    commit index, apply index can be larger than commit index and cause panic. To
-    solve the problem, persisting commit index with or before applying entries.
-    You can also always assign commit index to the `max(commit_index, applied_index)`
-    after restarting, *it may work but potential log loss may also be ignored silently*.
+   Note, although Raft guarentees only persisted committed entries will be applied,
+   but it doesn't guarentee commit index is persisted before being applied. For example,
+   if application is restarted after applying committed entries before persisting
+   commit index, apply index can be larger than commit index and cause panic. To
+   solve the problem, persisting commit index with or before applying entries.
+   You can also always assign commit index to the `max(commit_index, applied_index)`
+   after restarting, *it may work but potential log loss may also be ignored silently*.
 
 4. Check whether `entries` is empty or not. If not empty, it means that there are newly added
    entries but have not been committed yet, we must append the entries to the Raft log:
@@ -425,7 +425,7 @@ above except:
 1. All writes are not required to be persisted immediately, they can be written into memory caches;
 2. Persisted messages should be sent after all corresponding writes are persisted;
 3. [`advance_append_async`](RawNode::advance_append_async) is used when all writes are finished
-    instead of `advance/advance_append`.
+   instead of `advance/advance_append`.
 4. Only persisted entries can be committed and applied, so to make progress, all writes should
    be persisted at some point.
 
@@ -585,7 +585,7 @@ pub fn default_logger() -> slog::Logger {
 
     if let Some(case) = std::thread::current()
         .name()
-        .and_then(|v| v.split(':').last())
+        .and_then(|v| v.split(':').next_back())
     {
         logger.new(o!("case" => case.to_string()))
     } else {

src/raw_node.rs

@@ -718,7 +718,7 @@ impl<T: Storage> RawNode<T> {
 
     /// Status returns the current status of the given group.
     #[inline]
-    pub fn status(&self) -> Status {
+    pub fn status(&self) -> Status<'_> {
         Status::new(&self.raft)
     }