From 90907f73117a4a2d08202d8819959a5dc9c301d1 Mon Sep 17 00:00:00 2001
From: Eduardo Trujillo <ed@chromabits.com>
Date: Mon, 21 Nov 2022 15:21:49 -0800
Subject: [PATCH] chore: Address clippy lints
---
src/condition.rs | 2 +-
src/dbus_wrappers/manager.rs | 2 +-
src/dbus_wrappers/signal.rs | 4 ++--
src/event.rs | 6 +++---
src/main.rs | 12 ++++++++++--
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/condition.rs b/src/condition.rs
index 7d03aa7..914729b 100644
--- a/src/condition.rs
+++ b/src/condition.rs
@@ -187,7 +187,7 @@ async fn device_is_connected_to_one_of(
) -> Result<bool> {
match device_identifier.to_device(conn).await? {
Some(device) => {
- let active_connections: Vec<ActiveConnectionWrapper> = stream::iter(connections)
+ let active_connections: Vec<ActiveConnectionWrapper<'_>> = stream::iter(connections)
.filter_map(|connection_identifier| async move {
match connection_identifier.to_active_connection(conn).await {
Ok(active_connection) => active_connection,
diff --git a/src/dbus_wrappers/manager.rs b/src/dbus_wrappers/manager.rs
index 83413db..30a6471 100644
--- a/src/dbus_wrappers/manager.rs
+++ b/src/dbus_wrappers/manager.rs
@@ -80,7 +80,7 @@ impl<'a> ManagerWrapper<'a> {
let stream = stream::iter(active_connections);
- let mut matches: Vec<ActiveConnectionWrapper> = stream
+ let mut matches: Vec<ActiveConnectionWrapper<'_>> = stream
.filter_map(|active_connection| async move {
let current_uuid = active_connection.get_uuid().await;
diff --git a/src/dbus_wrappers/signal.rs b/src/dbus_wrappers/signal.rs
index 4089f35..b8d84b0 100644
--- a/src/dbus_wrappers/signal.rs
+++ b/src/dbus_wrappers/signal.rs
@@ -55,8 +55,8 @@ impl<T> SignalStreamWrapper<T> {
}
pub async fn dispose(&self) -> anyhow::Result<()> {
- let result = self.conn.remove_match(self.msg_match.token()).await?;
+ self.conn.remove_match(self.msg_match.token()).await?;
- Ok(result)
+ Ok(())
}
}
diff --git a/src/event.rs b/src/event.rs
index 6d72c7c..3c82f15 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -168,9 +168,9 @@ impl Trigger {
},
(Event::StateChanged { state }, Trigger::StateChanged { states }) => {
Ok(states.contains(state))
- },
- (Event::DaemonStarted, Trigger::DaemonStarted) => {Ok(true)},
- (Event::DaemonStopping, Trigger::DaemonStopping) => {Ok(true)},
+ }
+ (Event::DaemonStarted, Trigger::DaemonStarted)
+ | (Event::DaemonStopping, Trigger::DaemonStopping) => Ok(true),
_ => Ok(false),
}
}
diff --git a/src/main.rs b/src/main.rs
index 2857659..5b783f8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,12 @@
+#![deny(
+ rust_2018_idioms,
+ nonstandard_style,
+ clippy::doc_markdown,
+ clippy::match_bool,
+ clippy::match_same_arms
+)]
+#![warn(future_incompatible)]
+
use collective::{
cli::{AppOpts, ConfigurableAppOpts},
config::ConfigFileFormat,
@@ -89,8 +98,7 @@ async fn inner_main() -> anyhow::Result<()> {
let mut task_handles = vec![];
let watcher_handle = watcher::watch(&conn, stop_signal_tx.subscribe(), event_tx).await?;
- let event_handler_handle =
- handle_events(conn.clone(), config, event_rx).await?;
+ let event_handler_handle = handle_events(conn.clone(), config, event_rx).await?;
task_handles.push(watcher_handle);
task_handles.push(event_handler_handle);
--
GitLab