From 7bb8aa157bf5bfd0adfe99156dbad65338cefd82 Mon Sep 17 00:00:00 2001
From: Yaroslav Dynnikov <yaroslav.dynnikov@gmail.com>
Date: Mon, 18 Apr 2022 09:27:45 +0300
Subject: [PATCH] Fix clippy warnings
---
src/main.rs | 14 ++++++++------
src/traft/network.rs | 2 +-
src/traft/node.rs | 10 +++++-----
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index eef8a290d6..7a1a5e5a65 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,7 +53,8 @@ fn picolib_setup(args: &args::Run) {
luamod.set(
"raft_tick",
tlua::function1(|n_times: u32| -> Result<(), traft::node::Error> {
- Ok(traft::node::global()?.tick(n_times))
+ traft::node::global()?.tick(n_times);
+ Ok(())
}),
);
luamod.set(
@@ -71,7 +72,8 @@ fn picolib_setup(args: &args::Run) {
luamod.set(
"raft_timeout_now",
tlua::function0(|| -> Result<(), traft::node::Error> {
- Ok(traft::node::global()?.timeout_now())
+ traft::node::global()?.timeout_now();
+ Ok(())
}),
);
luamod.set(
@@ -273,7 +275,7 @@ fn main_run(args: args::Run) -> ExitStatus {
}
tlog!(Info, "[supervisor] tarantool process finished: {:?}",
- WaitStatus::from_raw(child.into(), rc);
+ WaitStatus::from_raw(child, rc);
);
if let Some(msg) = msg {
@@ -294,7 +296,7 @@ fn start_discover(supervisor: Supervisor) {
tlog!(Info, ">>>>> start_discover()");
let args = &supervisor.args;
- picolib_setup(&args);
+ picolib_setup(args);
assert!(tarantool::cfg().is_none());
let mut cfg = tarantool::Cfg {
@@ -325,7 +327,7 @@ fn start_discover(supervisor: Supervisor) {
let role = discovery::wait_global();
// TODO assert traft::Storage::instance_id == (null || args.instance_id)
- if let Some(_) = traft::Storage::id().unwrap() {
+ if traft::Storage::id().unwrap().is_some() {
return postjoin(supervisor);
}
@@ -436,7 +438,7 @@ fn start_join(leader_uri: String, supervisor: Supervisor) {
let fn_name = stringify_cfunc!(raft_join);
let resp: traft::node::JoinResponse = tarantool::net_box_call_retry(&leader_uri, fn_name, &req);
- picolib_setup(&args);
+ picolib_setup(args);
assert!(tarantool::cfg().is_none());
let cfg = tarantool::Cfg {
diff --git a/src/traft/network.rs b/src/traft/network.rs
index 3017e9a4de..372885416b 100644
--- a/src/traft/network.rs
+++ b/src/traft/network.rs
@@ -255,7 +255,7 @@ inventory::submit!(crate::InnerTest {
tlua::function1(move |pb: tlua::AnyLuaString| {
use protobuf::Message as _;
let mut msg = raft::Message::default();
- msg.merge_from_bytes(&pb.as_bytes()).unwrap();
+ msg.merge_from_bytes(pb.as_bytes()).unwrap();
tx.send((msg.msg_type, msg.to, msg.from)).unwrap();
// Lock forever, never respond. This trick allows to check
diff --git a/src/traft/node.rs b/src/traft/node.rs
index e3630c3ef6..5fe4421ca2 100644
--- a/src/traft/node.rs
+++ b/src/traft/node.rs
@@ -38,7 +38,7 @@ pub enum Error {
#[error("timeout")]
Timeout,
#[error("{0}")]
- RaftError(#[from] RaftError),
+ Raft(#[from] RaftError),
}
#[derive(Clone, Debug, tlua::Push, tlua::PushInto)]
@@ -108,10 +108,10 @@ impl Node {
let node = Node {
loop_cond: loop_cond.clone(),
- main_inbox: main_inbox.clone(),
- join_inbox: join_inbox.clone(),
- status: status.clone(),
- status_cond: status_cond.clone(),
+ main_inbox,
+ join_inbox,
+ status,
+ status_cond,
_main_loop: fiber::start_proc(main_loop_fn),
_join_loop: fiber::start_proc(join_loop_fn),
};
--
GitLab