From 10c04fab9aab651cc525ff777bab5f27805c493d Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 9 Oct 2018 13:53:54 +0200 Subject: Fix some clippy lints --- src/pa_eq/mod.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/pa_eq/mod.rs') 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 { Ok(Connection::open_private(&pulse_sock_path)?) } -fn get_equalized_sink<'a>(conn: &'a Connection) -> Result, Error> { +fn get_equalized_sink(conn: &Connection) -> Result, 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, Error> { +fn get_equalized_sink_impl(conn: &Connection) -> Result, 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(()) -- cgit v1.2.3