From fbfa01871b9243b7ed37facbfc9943a461f09349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=82=8E=E6=B3=BC?= <drdr.xp@gmail.com>
Date: Sat, 31 Aug 2024 20:55:42 +0800
Subject: [PATCH] Chore: fix lint warnings

---
 examples/raft-kv-memstore-network-v2/src/store.rs          | 4 +++-
 .../raft-kv-memstore-opendal-snapshot-data/src/store.rs    | 4 +++-
 examples/raft-kv-memstore-singlethreaded/src/store.rs      | 4 +++-
 examples/raft-kv-memstore/src/store/mod.rs                 | 4 +++-
 openraft/src/error/streaming_error.rs                      | 2 ++
 openraft/src/raft/raft_inner.rs                            | 7 ++-----
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/examples/raft-kv-memstore-network-v2/src/store.rs b/examples/raft-kv-memstore-network-v2/src/store.rs
index a65e55b3b..089f9b323 100644
--- a/examples/raft-kv-memstore-network-v2/src/store.rs
+++ b/examples/raft-kv-memstore-network-v2/src/store.rs
@@ -49,7 +49,9 @@ pub struct StoredSnapshot {
     pub data: Box<typ::SnapshotData>,
 }
 
-/// Data contained in the Raft state machine. Note that we are using `serde` to serialize the
+/// Data contained in the Raft state machine.
+///
+/// Note that we are using `serde` to serialize the
 /// `data`, which has a implementation to be serialized. Note that for this test we set both the key
 /// and value as String, but you could set any type of value that has the serialization impl.
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
diff --git a/examples/raft-kv-memstore-opendal-snapshot-data/src/store.rs b/examples/raft-kv-memstore-opendal-snapshot-data/src/store.rs
index 56e4a14de..1f6603870 100644
--- a/examples/raft-kv-memstore-opendal-snapshot-data/src/store.rs
+++ b/examples/raft-kv-memstore-opendal-snapshot-data/src/store.rs
@@ -52,7 +52,9 @@ pub struct StoredSnapshot {
     pub data: Box<typ::SnapshotData>,
 }
 
-/// Data contained in the Raft state machine. Note that we are using `serde` to serialize the
+/// Data contained in the Raft state machine.
+///
+/// Note that we are using `serde` to serialize the
 /// `data`, which has a implementation to be serialized. Note that for this test we set both the key
 /// and value as String, but you could set any type of value that has the serialization impl.
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
diff --git a/examples/raft-kv-memstore-singlethreaded/src/store.rs b/examples/raft-kv-memstore-singlethreaded/src/store.rs
index afb3d3917..6ddb49437 100644
--- a/examples/raft-kv-memstore-singlethreaded/src/store.rs
+++ b/examples/raft-kv-memstore-singlethreaded/src/store.rs
@@ -78,7 +78,9 @@ pub struct StoredSnapshot {
     pub data: Vec<u8>,
 }
 
-/// Data contained in the Raft state machine. Note that we are using `serde` to serialize the
+/// Data contained in the Raft state machine.
+///
+/// Note that we are using `serde` to serialize the
 /// `data`, which has a implementation to be serialized. Note that for this test we set both the key
 /// and value as String, but you could set any type of value that has the serialization impl.
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
diff --git a/examples/raft-kv-memstore/src/store/mod.rs b/examples/raft-kv-memstore/src/store/mod.rs
index ab6556e2f..d98dd855e 100644
--- a/examples/raft-kv-memstore/src/store/mod.rs
+++ b/examples/raft-kv-memstore/src/store/mod.rs
@@ -56,7 +56,9 @@ pub struct StoredSnapshot {
     pub data: Vec<u8>,
 }
 
-/// Data contained in the Raft state machine. Note that we are using `serde` to serialize the
+/// Data contained in the Raft state machine.
+///
+/// Note that we are using `serde` to serialize the
 /// `data`, which has a implementation to be serialized. Note that for this test we set both the key
 /// and value as String, but you could set any type of value that has the serialization impl.
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
diff --git a/openraft/src/error/streaming_error.rs b/openraft/src/error/streaming_error.rs
index d5983c107..a7f754e96 100644
--- a/openraft/src/error/streaming_error.rs
+++ b/openraft/src/error/streaming_error.rs
@@ -66,6 +66,7 @@ impl<C: RaftTypeConfig> From<StreamingError<C, Fatal<C>>> for ReplicationError<C
 
 impl<C: RaftTypeConfig> From<RPCError<C>> for StreamingError<C> {
     fn from(value: RPCError<C>) -> Self {
+        #[allow(unreachable_patterns)]
         match value {
             RPCError::Timeout(e) => StreamingError::Timeout(e),
             RPCError::Unreachable(e) => StreamingError::Unreachable(e),
@@ -80,6 +81,7 @@ impl<C: RaftTypeConfig> From<RPCError<C>> for StreamingError<C> {
 
 impl<C: RaftTypeConfig> From<StreamingError<C>> for ReplicationError<C> {
     fn from(e: StreamingError<C>) -> Self {
+        #[allow(unreachable_patterns)]
         match e {
             StreamingError::Closed(e) => ReplicationError::Closed(e),
             StreamingError::StorageError(e) => ReplicationError::StorageError(e),
diff --git a/openraft/src/raft/raft_inner.rs b/openraft/src/raft/raft_inner.rs
index 2bbf6cdd2..3c190da40 100644
--- a/openraft/src/raft/raft_inner.rs
+++ b/openraft/src/raft/raft_inner.rs
@@ -166,11 +166,8 @@ where C: RaftTypeConfig
             message_summary.unwrap_or_default()
         );
 
-        match core_res {
-            // A normal quit is still an unexpected "stop" to the caller.
-            Ok(_) => Fatal::Stopped,
-            Err(e) => e,
-        }
+        // Safe unwrap: core_res is always an error
+        core_res.unwrap_err()
     }
 
     /// Wait for `RaftCore` task to finish and record the returned value from the task.