Dep: adapt rust stable-1.63 and nightly 2022-08-11

.github/workflows/ci.yaml

@@ -89,22 +89,15 @@ jobs:
 
 
       - name: Build | Release Mode | No features
+        # rust stable 1.63 and nightly 2022-08-11 is incompatible on
+        # std::error::Error.
+        # Can not enable feature `bt` on stable anymore.
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --release
 
 
-      - name: Build | Release Mode | No features
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --all-features
-        env:
-          # Enable unstable feature on stalbe rust.
-          RUSTC_BOOTSTRAP: 1
-
-
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         if: failure()

openraft/Cargo.toml

@@ -16,8 +16,8 @@ repository = "https://github.com/datafuselabs/openraft"
 readme = "../README.md"
 
 [dependencies]
-anyhow = "1.0.32"
-anyerror = { version = "0.1.6", features = ["anyhow"]}
+anyhow = "1.0.63"
+anyerror = { version = "0.1.7", features = ["anyhow"]}
 async-trait = "0.1.36"
 byte-unit = "4.0.12"
 bytes = "1.0"
@@ -27,7 +27,7 @@ maplit = "1.0.2"
 rand = "0.8"
 serde = { version="1", features=["derive"] }
 clap = { version = "3.0.7", features = ["derive", "env"] }
-thiserror = "1.0.29"
+thiserror = "1.0.33"
 tokio = { version="1.8", default-features=false, features=["fs", "io-util", "macros", "rt", "rt-multi-thread", "sync", "time"] }
 tracing = "0.1.29"
 tracing-futures = "0.2.4"

openraft/src/config/config.rs

@@ -14,7 +14,7 @@ use crate::config::error::ConfigError;
 /// would cause a leader to send an `InstallSnapshot` RPC to a follower based on replication lag.
 ///
 /// Additional policies may become available in the future.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SnapshotPolicy {
     /// A snapshot will be generated once the log has grown the specified number of logs since
     /// the last snapshot.

openraft/src/config/error.rs

@@ -1,5 +1,5 @@
 /// Error variants related to configuration.
-#[derive(Debug, thiserror::Error, PartialEq)]
+#[derive(Debug, thiserror::Error, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum ConfigError {
     #[error("election timeout: min({min}) must be < max({max})")]

openraft/src/core/install_snapshot.rs

@@ -75,12 +75,10 @@ impl<D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>> Ra
         //   to receive the new snapshot,
         // - Mismatched id with offset greater than 0 is an out of order message that should be rejected.
         match self.snapshot_state.take() {
-            None => {
-                return self.begin_installing_snapshot(req).await;
-            }
+            None => self.begin_installing_snapshot(req).await,
             Some(SnapshotState::Snapshotting { handle, .. }) => {
                 handle.abort(); // Abort the current compaction in favor of installation from leader.
-                return self.begin_installing_snapshot(req).await;
+                self.begin_installing_snapshot(req).await
             }
             Some(SnapshotState::Streaming { snapshot, id, offset }) => {
                 if req.meta.snapshot_id == id {

openraft/src/lib.rs

@@ -1,11 +1,11 @@
 #![doc = include_str!("../README.md")]
-#![cfg_attr(feature = "bt", feature(backtrace))]
+#![cfg_attr(feature = "bt", feature(error_generic_member_access))]
+#![cfg_attr(feature = "bt", feature(provide_any))]
 
 //! # Feature flags
 //!
-//! - `bt`: Enable backtrace: generate backtrace for errors. This requires a unstable feature `backtrace` thus it can
-//!   not be used with stable rust, unless explicity allowing using unstable features in stable rust with
-//!   `RUSTC_BOOTSTRAP=1`.
+//! - `bt`: Enable backtrace: generate backtrace for errors. This requires a unstable feature
+//!   `error_generic_member_access` and `provde_any` thus it can not be used with stable rust.
 
 mod config;
 mod core;

openraft/src/types/v070/entry.rs

@@ -6,7 +6,7 @@ use super::LogId;
 use super::Membership;
 
 /// A Raft log entry.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Entry<D: AppData> {
     pub log_id: LogId,
 
@@ -16,7 +16,7 @@ pub struct Entry<D: AppData> {
 }
 
 /// Log entry payload variants.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum EntryPayload<D: AppData> {
     /// An empty payload committed by a new cluster leader.
     Blank,

rust-toolchain

@@ -1 +1 @@
-nightly-2022-01-01
+nightly-2022-08-11

rustfmt.toml

@@ -29,7 +29,6 @@ imports_granularity     = "Item"
 group_imports           = "StdExternalCrate"
 where_single_line       = true
 trailing_comma          = "Vertical"
-report_fixme            = "Unnumbered"
 overflow_delimited_expr = true
 wrap_comments           = true
 comment_width           = 120