From 10c04fab9aab651cc525ff777bab5f27805c493d Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 9 Oct 2018 13:53:54 +0200
Subject: Fix some clippy lints

---
 src/pa_effects.rs         |  6 +++---
 src/pa_eq/dbus_api/mod.rs |  3 +++
 src/pa_eq/mod.rs          | 17 ++++++++++-------
 src/parsing/mod.rs        |  1 +
 src/utils.rs              |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/pa_effects.rs b/src/pa_effects.rs
index 43d27cb..801f317 100644
--- a/src/pa_effects.rs
+++ b/src/pa_effects.rs
@@ -6,7 +6,7 @@ use failure::Error;
 
 use serde_json;
 
-const DEFAULT_PRESET: &'static str = include_str!("../res/default-pa-effects-preset.json");
+const DEFAULT_PRESET: &str = include_str!("../res/default-pa-effects-preset.json");
 
 pub fn main(cmd: Command) -> Result<(), Error> {
     use cli::pa_effects::Command::*;
@@ -40,7 +40,7 @@ fn export_preset(args: ExportPresetCli) -> Result<(), Error> {
 fn filter_to_eq_preset(mut filter: Filter) -> serde_json::Value {
     if filter.frequencies.len() > 30 {
         info!("More than 30 frequencies specified, taking the approximative approach");
-        filter = simplify_filter(filter);
+        filter = simplify_filter(&filter);
     }
 
     let mut equalizer: serde_json::Value = json!({
@@ -66,7 +66,7 @@ fn filter_to_eq_preset(mut filter: Filter) -> serde_json::Value {
     equalizer
 }
 
-fn simplify_filter(filter: Filter) -> Filter {
+fn simplify_filter(filter: &Filter) -> Filter {
     //let partition_size = (filter.frequencies.len() as f64 / 30f64).floor() as usize;
     let mut partition_size = filter.frequencies.len() / 30;
     let step_error = filter.frequencies.len() as f64 % 30f64;
diff --git a/src/pa_eq/dbus_api/mod.rs b/src/pa_eq/dbus_api/mod.rs
index a184c55..cd2bbcd 100644
--- a/src/pa_eq/dbus_api/mod.rs
+++ b/src/pa_eq/dbus_api/mod.rs
@@ -1,3 +1,6 @@
+#[allow(clippy)]
 pub mod equalizing_manager;
+#[allow(clippy)]
 pub mod server_lookup;
+#[allow(clippy)]
 pub mod sink;
diff --git a/src/pa_eq/mod.rs b/src/pa_eq/mod.rs
index f7f1875..797468f 100644
--- a/src/pa_eq/mod.rs
+++ b/src/pa_eq/mod.rs
@@ -1,8 +1,8 @@
 mod dbus_api;
 
-use Filter;
 use cli::pa_eq::*;
 use utils::*;
+use Filter;
 
 use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager;
 use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1;
@@ -35,7 +35,8 @@ pub fn reset(_args: ResetCli) -> Result<(), Error> {
         preamp: 1f64,
         frequencies: vec![],
         coefficients: vec![],
-    }.pad(filter_rate);
+    }
+    .pad(filter_rate);
 
     send_filter(&conn_sink, filter)?;
 
@@ -68,15 +69,13 @@ fn connect_impl() -> Result<Connection, Error> {
     Ok(Connection::open_private(&pulse_sock_path)?)
 }
 
-fn get_equalized_sink<'a>(conn: &'a Connection) -> Result<ConnPath<'a, &'a Connection>, Error> {
+fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<&Connection>, Error> {
     Ok(get_equalized_sink_impl(conn).context(
         "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?",
     )?)
 }
 
-fn get_equalized_sink_impl<'a>(
-    conn: &'a Connection,
-) -> Result<ConnPath<'a, &'a Connection>, Error> {
+fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, Error> {
     let conn_manager = conn.with_path("org.PulseAudio.Core1", "/org/pulseaudio/equalizing1", 2000);
 
     // TODO: make that a command-line option
@@ -96,7 +95,11 @@ fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<(),
     conn_sink.seed_filter(
         channel,
         filter.frequencies,
-        filter.coefficients.into_iter().map(decibel_to_ratio).collect(),
+        filter
+            .coefficients
+            .into_iter()
+            .map(decibel_to_ratio)
+            .collect(),
         decibel_to_ratio(filter.preamp),
     )?;
     Ok(())
diff --git a/src/parsing/mod.rs b/src/parsing/mod.rs
index b613585..3aedb2c 100644
--- a/src/parsing/mod.rs
+++ b/src/parsing/mod.rs
@@ -1,3 +1,4 @@
+#[allow(clippy)]
 pub mod equalizer_apo;
 
 pub use self::equalizer_apo::MainParser as EqualizerApoParser;
diff --git a/src/utils.rs b/src/utils.rs
index 26facc4..24df0ce 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -47,7 +47,7 @@ pub fn parse_filter(content: &str) -> Result<Filter, Error> {
     // TODO: lifetime issue when "throwing" parse error
     let filter = EqualizerApoParser::new()
         .parse(&content)
-        .map_err(|e| convert_parse_error(EqualizerConfFormat::EqualizerAPO, e))?;
+        .map_err(|e| convert_parse_error(EqualizerConfFormat::EqualizerAPO, &e))?;
     trace!("Parsed filter: {:?}", filter);
 
     Ok(filter)
@@ -55,7 +55,7 @@ pub fn parse_filter(content: &str) -> Result<Filter, Error> {
 
 fn convert_parse_error<L, T, E>(
     format: EqualizerConfFormat,
-    error: lalrpop_util::ParseError<L, T, E>,
+    error: &lalrpop_util::ParseError<L, T, E>,
 ) -> ParseError
 where
     L: fmt::Display,
-- 
cgit v1.2.3