summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2019-05-04 17:49:34 +0200
committerMinijackson <minijackson@riseup.net>2019-05-04 17:49:34 +0200
commitb4c2de6a1a50e1b9cdb3fc666023dd5b2d1a3e61 (patch)
treedfb4838e2750da15d251a9d4036ee7f77f9ce4ce /src
parent41d2a19ad7ee5b20b5fbe268e4c96ac1e8afce8f (diff)
downloadset_eq-b4c2de6a1a50e1b9cdb3fc666023dd5b2d1a3e61.tar.gz
set_eq-b4c2de6a1a50e1b9cdb3fc666023dd5b2d1a3e61.zip
Upgrade to 2018 edition
Diffstat (limited to 'src')
-rw-r--r--src/main.rs4
-rw-r--r--src/pa_effects.rs8
-rw-r--r--src/pa_eq/dbus_api/equalizing_manager.rs60
-rw-r--r--src/pa_eq/dbus_api/mod.rs6
-rw-r--r--src/pa_eq/dbus_api/server_lookup.rs44
-rw-r--r--src/pa_eq/dbus_api/sink.rs226
-rw-r--r--src/pa_eq/mod.rs8
-rw-r--r--src/utils.rs6
8 files changed, 181 insertions, 181 deletions
diff --git a/src/main.rs b/src/main.rs
index 669ec4b..ee8f2b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,7 +29,7 @@ mod pa_eq;
29#[cfg(feature = "pa-effects")] 29#[cfg(feature = "pa-effects")]
30mod pa_effects; 30mod pa_effects;
31 31
32use cli::*; 32use crate::cli::*;
33 33
34use failure::Error; 34use failure::Error;
35use structopt::StructOpt; 35use structopt::StructOpt;
@@ -76,7 +76,7 @@ fn start() -> Result<(), Error> {
76 let args = Cli::from_args(); 76 let args = Cli::from_args();
77 args.log.log_all(Some(args.verbose.log_level()))?; 77 args.log.log_all(Some(args.verbose.log_level()))?;
78 78
79 use Command::*; 79 use crate::Command::*;
80 80
81 match args.cmd { 81 match args.cmd {
82 #[cfg(feature = "pa-eq")] 82 #[cfg(feature = "pa-eq")]
diff --git a/src/pa_effects.rs b/src/pa_effects.rs
index b82084e..9ead768 100644
--- a/src/pa_effects.rs
+++ b/src/pa_effects.rs
@@ -1,6 +1,6 @@
1use cli::pa_effects::*; 1use crate::cli::pa_effects::*;
2use utils::*; 2use crate::utils::*;
3use Filter; 3use crate::Filter;
4 4
5use failure::{Error, ResultExt}; 5use failure::{Error, ResultExt};
6 6
@@ -11,7 +11,7 @@ use std::io::{self, Write};
11const DEFAULT_PRESET: &str = include_str!("../res/default-pa-effects-preset.json"); 11const DEFAULT_PRESET: &str = include_str!("../res/default-pa-effects-preset.json");
12 12
13pub fn main(cmd: Command) -> Result<(), Error> { 13pub fn main(cmd: Command) -> Result<(), Error> {
14 use cli::pa_effects::Command::*; 14 use crate::cli::pa_effects::Command::*;
15 15
16 match cmd { 16 match cmd {
17 ExportPreset(args) => export_preset(args), 17 ExportPreset(args) => export_preset(args),
diff --git a/src/pa_eq/dbus_api/equalizing_manager.rs b/src/pa_eq/dbus_api/equalizing_manager.rs
index 5f6574f..1ea6111 100644
--- a/src/pa_eq/dbus_api/equalizing_manager.rs
+++ b/src/pa_eq/dbus_api/equalizing_manager.rs
@@ -17,11 +17,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgPulseAudioExtEqualizi
17 type Err = dbus::Error; 17 type Err = dbus::Error;
18 18
19 fn remove_profile(&self, name: &str) -> Result<(), Self::Err> { 19 fn remove_profile(&self, name: &str) -> Result<(), Self::Err> {
20 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| { 20 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| {
21 let mut i = arg::IterAppend::new(msg); 21 let mut i = arg::IterAppend::new(msg);
22 i.append(name); 22 i.append(name);
23 })); 23 }));
24 try!(m.as_result()); 24 r#try!(m.as_result());
25 Ok(()) 25 Ok(())
26 } 26 }
27 27
@@ -51,9 +51,9 @@ where
51 let fclone = f.clone(); 51 let fclone = f.clone();
52 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 52 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
53 let mut i = minfo.msg.iter_init(); 53 let mut i = minfo.msg.iter_init();
54 let name: &str = try!(i.read()); 54 let name: &str = r#try!(i.read());
55 let d = fclone(minfo); 55 let d = fclone(minfo);
56 try!(d.remove_profile(name)); 56 r#try!(d.remove_profile(name));
57 let rm = minfo.msg.method_return(); 57 let rm = minfo.msg.method_return();
58 Ok(vec!(rm)) 58 Ok(vec!(rm))
59 }; 59 };
@@ -67,7 +67,7 @@ where
67 let p = p.on_get(move |a, pinfo| { 67 let p = p.on_get(move |a, pinfo| {
68 let minfo = pinfo.to_method_info(); 68 let minfo = pinfo.to_method_info();
69 let d = fclone(&minfo); 69 let d = fclone(&minfo);
70 a.append(try!(d.get_interface_revision())); 70 a.append(r#try!(d.get_interface_revision()));
71 Ok(()) 71 Ok(())
72 }); 72 });
73 let i = i.add_p(p); 73 let i = i.add_p(p);
@@ -78,7 +78,7 @@ where
78 let p = p.on_get(move |a, pinfo| { 78 let p = p.on_get(move |a, pinfo| {
79 let minfo = pinfo.to_method_info(); 79 let minfo = pinfo.to_method_info();
80 let d = fclone(&minfo); 80 let d = fclone(&minfo);
81 a.append(try!(d.get_equalized_sinks())); 81 a.append(r#try!(d.get_equalized_sinks()));
82 Ok(()) 82 Ok(())
83 }); 83 });
84 let i = i.add_p(p); 84 let i = i.add_p(p);
@@ -89,7 +89,7 @@ where
89 let p = p.on_get(move |a, pinfo| { 89 let p = p.on_get(move |a, pinfo| {
90 let minfo = pinfo.to_method_info(); 90 let minfo = pinfo.to_method_info();
91 let d = fclone(&minfo); 91 let d = fclone(&minfo);
92 a.append(try!(d.get_profiles())); 92 a.append(r#try!(d.get_profiles()));
93 Ok(()) 93 Ok(())
94 }); 94 });
95 let i = i.add_p(p); 95 let i = i.add_p(p);
@@ -108,7 +108,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkAdded {
108 (&self.sink as &arg::RefArg).append(i); 108 (&self.sink as &arg::RefArg).append(i);
109 } 109 }
110 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 110 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
111 self.sink = try!(i.read()); 111 self.sink = r#try!(i.read());
112 Ok(()) 112 Ok(())
113 } 113 }
114} 114}
@@ -125,7 +125,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkRemoved {
125 (&self.sink as &arg::RefArg).append(i); 125 (&self.sink as &arg::RefArg).append(i);
126 } 126 }
127 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 127 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
128 self.sink = try!(i.read()); 128 self.sink = r#try!(i.read());
129 Ok(()) 129 Ok(())
130 } 130 }
131} 131}
@@ -153,11 +153,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusIntros
153 type Err = dbus::Error; 153 type Err = dbus::Error;
154 154
155 fn introspect(&self) -> Result<String, Self::Err> { 155 fn introspect(&self) -> Result<String, Self::Err> {
156 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { 156 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| {
157 })); 157 }));
158 try!(m.as_result()); 158 r#try!(m.as_result());
159 let mut i = m.iter_init(); 159 let mut i = m.iter_init();
160 let data: String = try!(i.read()); 160 let data: String = r#try!(i.read());
161 Ok(data) 161 Ok(data)
162 } 162 }
163} 163}
@@ -174,7 +174,7 @@ where
174 let fclone = f.clone(); 174 let fclone = f.clone();
175 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 175 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
176 let d = fclone(minfo); 176 let d = fclone(minfo);
177 let data = try!(d.introspect()); 177 let data = r#try!(d.introspect());
178 let rm = minfo.msg.method_return(); 178 let rm = minfo.msg.method_return();
179 let rm = rm.append1(data); 179 let rm = rm.append1(data);
180 Ok(vec!(rm)) 180 Ok(vec!(rm))
@@ -196,36 +196,36 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
196 type Err = dbus::Error; 196 type Err = dbus::Error;
197 197
198 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> { 198 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
199 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { 199 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| {
200 let mut i = arg::IterAppend::new(msg); 200 let mut i = arg::IterAppend::new(msg);
201 i.append(interface_name); 201 i.append(interface_name);
202 i.append(property_name); 202 i.append(property_name);
203 })); 203 }));
204 try!(m.as_result()); 204 r#try!(m.as_result());
205 let mut i = m.iter_init(); 205 let mut i = m.iter_init();
206 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 206 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
207 Ok(value) 207 Ok(value)
208 } 208 }
209 209
210 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> { 210 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
211 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { 211 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| {
212 let mut i = arg::IterAppend::new(msg); 212 let mut i = arg::IterAppend::new(msg);
213 i.append(interface_name); 213 i.append(interface_name);
214 i.append(property_name); 214 i.append(property_name);
215 i.append(value); 215 i.append(value);
216 })); 216 }));
217 try!(m.as_result()); 217 r#try!(m.as_result());
218 Ok(()) 218 Ok(())
219 } 219 }
220 220
221 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> { 221 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
222 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { 222 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| {
223 let mut i = arg::IterAppend::new(msg); 223 let mut i = arg::IterAppend::new(msg);
224 i.append(interface_name); 224 i.append(interface_name);
225 })); 225 }));
226 try!(m.as_result()); 226 r#try!(m.as_result());
227 let mut i = m.iter_init(); 227 let mut i = m.iter_init();
228 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = try!(i.read()); 228 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
229 Ok(props) 229 Ok(props)
230 } 230 }
231} 231}
@@ -242,10 +242,10 @@ where
242 let fclone = f.clone(); 242 let fclone = f.clone();
243 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 243 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
244 let mut i = minfo.msg.iter_init(); 244 let mut i = minfo.msg.iter_init();
245 let interface_name: &str = try!(i.read()); 245 let interface_name: &str = r#try!(i.read());
246 let property_name: &str = try!(i.read()); 246 let property_name: &str = r#try!(i.read());
247 let d = fclone(minfo); 247 let d = fclone(minfo);
248 let value = try!(d.get(interface_name, property_name)); 248 let value = r#try!(d.get(interface_name, property_name));
249 let rm = minfo.msg.method_return(); 249 let rm = minfo.msg.method_return();
250 let rm = rm.append1(value); 250 let rm = rm.append1(value);
251 Ok(vec!(rm)) 251 Ok(vec!(rm))
@@ -259,11 +259,11 @@ where
259 let fclone = f.clone(); 259 let fclone = f.clone();
260 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 260 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
261 let mut i = minfo.msg.iter_init(); 261 let mut i = minfo.msg.iter_init();
262 let interface_name: &str = try!(i.read()); 262 let interface_name: &str = r#try!(i.read());
263 let property_name: &str = try!(i.read()); 263 let property_name: &str = r#try!(i.read());
264 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 264 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
265 let d = fclone(minfo); 265 let d = fclone(minfo);
266 try!(d.set(interface_name, property_name, value)); 266 r#try!(d.set(interface_name, property_name, value));
267 let rm = minfo.msg.method_return(); 267 let rm = minfo.msg.method_return();
268 Ok(vec!(rm)) 268 Ok(vec!(rm))
269 }; 269 };
@@ -276,9 +276,9 @@ where
276 let fclone = f.clone(); 276 let fclone = f.clone();
277 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 277 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
278 let mut i = minfo.msg.iter_init(); 278 let mut i = minfo.msg.iter_init();
279 let interface_name: &str = try!(i.read()); 279 let interface_name: &str = r#try!(i.read());
280 let d = fclone(minfo); 280 let d = fclone(minfo);
281 let props = try!(d.get_all(interface_name)); 281 let props = r#try!(d.get_all(interface_name));
282 let rm = minfo.msg.method_return(); 282 let rm = minfo.msg.method_return();
283 let rm = rm.append1(props); 283 let rm = rm.append1(props);
284 Ok(vec!(rm)) 284 Ok(vec!(rm))
diff --git a/src/pa_eq/dbus_api/mod.rs b/src/pa_eq/dbus_api/mod.rs
index cd2bbcd..79dd38a 100644
--- a/src/pa_eq/dbus_api/mod.rs
+++ b/src/pa_eq/dbus_api/mod.rs
@@ -1,6 +1,6 @@
1#[allow(clippy)] 1#[allow(clippy::all)]
2pub mod equalizing_manager; 2pub mod equalizing_manager;
3#[allow(clippy)] 3#[allow(clippy::all)]
4pub mod server_lookup; 4pub mod server_lookup;
5#[allow(clippy)] 5#[allow(clippy::all)]
6pub mod sink; 6pub mod sink;
diff --git a/src/pa_eq/dbus_api/server_lookup.rs b/src/pa_eq/dbus_api/server_lookup.rs
index 78ad4bd..8451024 100644
--- a/src/pa_eq/dbus_api/server_lookup.rs
+++ b/src/pa_eq/dbus_api/server_lookup.rs
@@ -34,7 +34,7 @@ where
34 let p = p.on_get(move |a, pinfo| { 34 let p = p.on_get(move |a, pinfo| {
35 let minfo = pinfo.to_method_info(); 35 let minfo = pinfo.to_method_info();
36 let d = fclone(&minfo); 36 let d = fclone(&minfo);
37 a.append(try!(d.get_address())); 37 a.append(r#try!(d.get_address()));
38 Ok(()) 38 Ok(())
39 }); 39 });
40 let i = i.add_p(p); 40 let i = i.add_p(p);
@@ -50,11 +50,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusIntros
50 type Err = dbus::Error; 50 type Err = dbus::Error;
51 51
52 fn introspect(&self) -> Result<String, Self::Err> { 52 fn introspect(&self) -> Result<String, Self::Err> {
53 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { 53 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| {
54 })); 54 }));
55 try!(m.as_result()); 55 r#try!(m.as_result());
56 let mut i = m.iter_init(); 56 let mut i = m.iter_init();
57 let data: String = try!(i.read()); 57 let data: String = r#try!(i.read());
58 Ok(data) 58 Ok(data)
59 } 59 }
60} 60}
@@ -71,7 +71,7 @@ where
71 let fclone = f.clone(); 71 let fclone = f.clone();
72 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 72 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
73 let d = fclone(minfo); 73 let d = fclone(minfo);
74 let data = try!(d.introspect()); 74 let data = r#try!(d.introspect());
75 let rm = minfo.msg.method_return(); 75 let rm = minfo.msg.method_return();
76 let rm = rm.append1(data); 76 let rm = rm.append1(data);
77 Ok(vec!(rm)) 77 Ok(vec!(rm))
@@ -93,36 +93,36 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
93 type Err = dbus::Error; 93 type Err = dbus::Error;
94 94
95 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> { 95 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
96 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { 96 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| {
97 let mut i = arg::IterAppend::new(msg); 97 let mut i = arg::IterAppend::new(msg);
98 i.append(interface_name); 98 i.append(interface_name);
99 i.append(property_name); 99 i.append(property_name);
100 })); 100 }));
101 try!(m.as_result()); 101 r#try!(m.as_result());
102 let mut i = m.iter_init(); 102 let mut i = m.iter_init();
103 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 103 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
104 Ok(value) 104 Ok(value)
105 } 105 }
106 106
107 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> { 107 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
108 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { 108 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| {
109 let mut i = arg::IterAppend::new(msg); 109 let mut i = arg::IterAppend::new(msg);
110 i.append(interface_name); 110 i.append(interface_name);
111 i.append(property_name); 111 i.append(property_name);
112 i.append(value); 112 i.append(value);
113 })); 113 }));
114 try!(m.as_result()); 114 r#try!(m.as_result());
115 Ok(()) 115 Ok(())
116 } 116 }
117 117
118 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> { 118 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
119 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { 119 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| {
120 let mut i = arg::IterAppend::new(msg); 120 let mut i = arg::IterAppend::new(msg);
121 i.append(interface_name); 121 i.append(interface_name);
122 })); 122 }));
123 try!(m.as_result()); 123 r#try!(m.as_result());
124 let mut i = m.iter_init(); 124 let mut i = m.iter_init();
125 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = try!(i.read()); 125 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
126 Ok(props) 126 Ok(props)
127 } 127 }
128} 128}
@@ -139,10 +139,10 @@ where
139 let fclone = f.clone(); 139 let fclone = f.clone();
140 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 140 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
141 let mut i = minfo.msg.iter_init(); 141 let mut i = minfo.msg.iter_init();
142 let interface_name: &str = try!(i.read()); 142 let interface_name: &str = r#try!(i.read());
143 let property_name: &str = try!(i.read()); 143 let property_name: &str = r#try!(i.read());
144 let d = fclone(minfo); 144 let d = fclone(minfo);
145 let value = try!(d.get(interface_name, property_name)); 145 let value = r#try!(d.get(interface_name, property_name));
146 let rm = minfo.msg.method_return(); 146 let rm = minfo.msg.method_return();
147 let rm = rm.append1(value); 147 let rm = rm.append1(value);
148 Ok(vec!(rm)) 148 Ok(vec!(rm))
@@ -156,11 +156,11 @@ where
156 let fclone = f.clone(); 156 let fclone = f.clone();
157 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 157 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
158 let mut i = minfo.msg.iter_init(); 158 let mut i = minfo.msg.iter_init();
159 let interface_name: &str = try!(i.read()); 159 let interface_name: &str = r#try!(i.read());
160 let property_name: &str = try!(i.read()); 160 let property_name: &str = r#try!(i.read());
161 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 161 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
162 let d = fclone(minfo); 162 let d = fclone(minfo);
163 try!(d.set(interface_name, property_name, value)); 163 r#try!(d.set(interface_name, property_name, value));
164 let rm = minfo.msg.method_return(); 164 let rm = minfo.msg.method_return();
165 Ok(vec!(rm)) 165 Ok(vec!(rm))
166 }; 166 };
@@ -173,9 +173,9 @@ where
173 let fclone = f.clone(); 173 let fclone = f.clone();
174 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 174 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
175 let mut i = minfo.msg.iter_init(); 175 let mut i = minfo.msg.iter_init();
176 let interface_name: &str = try!(i.read()); 176 let interface_name: &str = r#try!(i.read());
177 let d = fclone(minfo); 177 let d = fclone(minfo);
178 let props = try!(d.get_all(interface_name)); 178 let props = r#try!(d.get_all(interface_name));
179 let rm = minfo.msg.method_return(); 179 let rm = minfo.msg.method_return();
180 let rm = rm.append1(props); 180 let rm = rm.append1(props);
181 Ok(vec!(rm)) 181 Ok(vec!(rm))
diff --git a/src/pa_eq/dbus_api/sink.rs b/src/pa_eq/dbus_api/sink.rs
index 6bd1756..6d8bfb7 100644
--- a/src/pa_eq/dbus_api/sink.rs
+++ b/src/pa_eq/dbus_api/sink.rs
@@ -26,88 +26,88 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgPulseAudioExtEqualizi
26 type Err = dbus::Error; 26 type Err = dbus::Error;
27 27
28 fn filter_at_points(&self, channel: u32, xs: Vec<u32>) -> Result<(Vec<f64>, f64), Self::Err> { 28 fn filter_at_points(&self, channel: u32, xs: Vec<u32>) -> Result<(Vec<f64>, f64), Self::Err> {
29 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"FilterAtPoints".into(), |msg| { 29 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"FilterAtPoints".into(), |msg| {
30 let mut i = arg::IterAppend::new(msg); 30 let mut i = arg::IterAppend::new(msg);
31 i.append(channel); 31 i.append(channel);
32 i.append(xs); 32 i.append(xs);
33 })); 33 }));
34 try!(m.as_result()); 34 r#try!(m.as_result());
35 let mut i = m.iter_init(); 35 let mut i = m.iter_init();
36 let ys: Vec<f64> = try!(i.read()); 36 let ys: Vec<f64> = r#try!(i.read());
37 let preamp: f64 = try!(i.read()); 37 let preamp: f64 = r#try!(i.read());
38 Ok((ys, preamp)) 38 Ok((ys, preamp))
39 } 39 }
40 40
41 fn seed_filter(&self, channel: u32, xs: Vec<u32>, ys: Vec<f64>, preamp: f64) -> Result<(), Self::Err> { 41 fn seed_filter(&self, channel: u32, xs: Vec<u32>, ys: Vec<f64>, preamp: f64) -> Result<(), Self::Err> {
42 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SeedFilter".into(), |msg| { 42 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SeedFilter".into(), |msg| {
43 let mut i = arg::IterAppend::new(msg); 43 let mut i = arg::IterAppend::new(msg);
44 i.append(channel); 44 i.append(channel);
45 i.append(xs); 45 i.append(xs);
46 i.append(ys); 46 i.append(ys);
47 i.append(preamp); 47 i.append(preamp);
48 })); 48 }));
49 try!(m.as_result()); 49 r#try!(m.as_result());
50 Ok(()) 50 Ok(())
51 } 51 }
52 52
53 fn save_profile(&self, channel: u32, name: &str) -> Result<(), Self::Err> { 53 fn save_profile(&self, channel: u32, name: &str) -> Result<(), Self::Err> {
54 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SaveProfile".into(), |msg| { 54 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SaveProfile".into(), |msg| {
55 let mut i = arg::IterAppend::new(msg); 55 let mut i = arg::IterAppend::new(msg);
56 i.append(channel); 56 i.append(channel);
57 i.append(name); 57 i.append(name);
58 })); 58 }));
59 try!(m.as_result()); 59 r#try!(m.as_result());
60 Ok(()) 60 Ok(())
61 } 61 }
62 62
63 fn load_profile(&self, channel: u32, name: &str) -> Result<(), Self::Err> { 63 fn load_profile(&self, channel: u32, name: &str) -> Result<(), Self::Err> {
64 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"LoadProfile".into(), |msg| { 64 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"LoadProfile".into(), |msg| {
65 let mut i = arg::IterAppend::new(msg); 65 let mut i = arg::IterAppend::new(msg);
66 i.append(channel); 66 i.append(channel);
67 i.append(name); 67 i.append(name);
68 })); 68 }));
69 try!(m.as_result()); 69 r#try!(m.as_result());
70 Ok(()) 70 Ok(())
71 } 71 }
72 72
73 fn set_filter(&self, channel: u32, ys: Vec<f64>, preamp: f64) -> Result<(), Self::Err> { 73 fn set_filter(&self, channel: u32, ys: Vec<f64>, preamp: f64) -> Result<(), Self::Err> {
74 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SetFilter".into(), |msg| { 74 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SetFilter".into(), |msg| {
75 let mut i = arg::IterAppend::new(msg); 75 let mut i = arg::IterAppend::new(msg);
76 i.append(channel); 76 i.append(channel);
77 i.append(ys); 77 i.append(ys);
78 i.append(preamp); 78 i.append(preamp);
79 })); 79 }));
80 try!(m.as_result()); 80 r#try!(m.as_result());
81 Ok(()) 81 Ok(())
82 } 82 }
83 83
84 fn get_filter(&self, channel: u32) -> Result<(Vec<f64>, f64), Self::Err> { 84 fn get_filter(&self, channel: u32) -> Result<(Vec<f64>, f64), Self::Err> {
85 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"GetFilter".into(), |msg| { 85 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"GetFilter".into(), |msg| {
86 let mut i = arg::IterAppend::new(msg); 86 let mut i = arg::IterAppend::new(msg);
87 i.append(channel); 87 i.append(channel);
88 })); 88 }));
89 try!(m.as_result()); 89 r#try!(m.as_result());
90 let mut i = m.iter_init(); 90 let mut i = m.iter_init();
91 let ys: Vec<f64> = try!(i.read()); 91 let ys: Vec<f64> = r#try!(i.read());
92 let preamp: f64 = try!(i.read()); 92 let preamp: f64 = r#try!(i.read());
93 Ok((ys, preamp)) 93 Ok((ys, preamp))
94 } 94 }
95 95
96 fn save_state(&self) -> Result<(), Self::Err> { 96 fn save_state(&self) -> Result<(), Self::Err> {
97 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SaveState".into(), |_| { 97 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"SaveState".into(), |_| {
98 })); 98 }));
99 try!(m.as_result()); 99 r#try!(m.as_result());
100 Ok(()) 100 Ok(())
101 } 101 }
102 102
103 fn base_profile(&self, channel: u32) -> Result<String, Self::Err> { 103 fn base_profile(&self, channel: u32) -> Result<String, Self::Err> {
104 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"BaseProfile".into(), |msg| { 104 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Equalizer".into(), &"BaseProfile".into(), |msg| {
105 let mut i = arg::IterAppend::new(msg); 105 let mut i = arg::IterAppend::new(msg);
106 i.append(channel); 106 i.append(channel);
107 })); 107 }));
108 try!(m.as_result()); 108 r#try!(m.as_result());
109 let mut i = m.iter_init(); 109 let mut i = m.iter_init();
110 let name: String = try!(i.read()); 110 let name: String = r#try!(i.read());
111 Ok(name) 111 Ok(name)
112 } 112 }
113 113
@@ -145,10 +145,10 @@ where
145 let fclone = f.clone(); 145 let fclone = f.clone();
146 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 146 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
147 let mut i = minfo.msg.iter_init(); 147 let mut i = minfo.msg.iter_init();
148 let channel: u32 = try!(i.read()); 148 let channel: u32 = r#try!(i.read());
149 let xs: Vec<u32> = try!(i.read()); 149 let xs: Vec<u32> = r#try!(i.read());
150 let d = fclone(minfo); 150 let d = fclone(minfo);
151 let (ys, preamp) = try!(d.filter_at_points(channel, xs)); 151 let (ys, preamp) = r#try!(d.filter_at_points(channel, xs));
152 let rm = minfo.msg.method_return(); 152 let rm = minfo.msg.method_return();
153 let rm = rm.append1(ys); 153 let rm = rm.append1(ys);
154 let rm = rm.append1(preamp); 154 let rm = rm.append1(preamp);
@@ -164,12 +164,12 @@ where
164 let fclone = f.clone(); 164 let fclone = f.clone();
165 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 165 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
166 let mut i = minfo.msg.iter_init(); 166 let mut i = minfo.msg.iter_init();
167 let channel: u32 = try!(i.read()); 167 let channel: u32 = r#try!(i.read());
168 let xs: Vec<u32> = try!(i.read()); 168 let xs: Vec<u32> = r#try!(i.read());
169 let ys: Vec<f64> = try!(i.read()); 169 let ys: Vec<f64> = r#try!(i.read());
170 let preamp: f64 = try!(i.read()); 170 let preamp: f64 = r#try!(i.read());
171 let d = fclone(minfo); 171 let d = fclone(minfo);
172 try!(d.seed_filter(channel, xs, ys, preamp)); 172 r#try!(d.seed_filter(channel, xs, ys, preamp));
173 let rm = minfo.msg.method_return(); 173 let rm = minfo.msg.method_return();
174 Ok(vec!(rm)) 174 Ok(vec!(rm))
175 }; 175 };
@@ -183,10 +183,10 @@ where
183 let fclone = f.clone(); 183 let fclone = f.clone();
184 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 184 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
185 let mut i = minfo.msg.iter_init(); 185 let mut i = minfo.msg.iter_init();
186 let channel: u32 = try!(i.read()); 186 let channel: u32 = r#try!(i.read());
187 let name: &str = try!(i.read()); 187 let name: &str = r#try!(i.read());
188 let d = fclone(minfo); 188 let d = fclone(minfo);
189 try!(d.save_profile(channel, name)); 189 r#try!(d.save_profile(channel, name));
190 let rm = minfo.msg.method_return(); 190 let rm = minfo.msg.method_return();
191 Ok(vec!(rm)) 191 Ok(vec!(rm))
192 }; 192 };
@@ -198,10 +198,10 @@ where
198 let fclone = f.clone(); 198 let fclone = f.clone();
199 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 199 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
200 let mut i = minfo.msg.iter_init(); 200 let mut i = minfo.msg.iter_init();
201 let channel: u32 = try!(i.read()); 201 let channel: u32 = r#try!(i.read());
202 let name: &str = try!(i.read()); 202 let name: &str = r#try!(i.read());
203 let d = fclone(minfo); 203 let d = fclone(minfo);
204 try!(d.load_profile(channel, name)); 204 r#try!(d.load_profile(channel, name));
205 let rm = minfo.msg.method_return(); 205 let rm = minfo.msg.method_return();
206 Ok(vec!(rm)) 206 Ok(vec!(rm))
207 }; 207 };
@@ -213,11 +213,11 @@ where
213 let fclone = f.clone(); 213 let fclone = f.clone();
214 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 214 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
215 let mut i = minfo.msg.iter_init(); 215 let mut i = minfo.msg.iter_init();
216 let channel: u32 = try!(i.read()); 216 let channel: u32 = r#try!(i.read());
217 let ys: Vec<f64> = try!(i.read()); 217 let ys: Vec<f64> = r#try!(i.read());
218 let preamp: f64 = try!(i.read()); 218 let preamp: f64 = r#try!(i.read());
219 let d = fclone(minfo); 219 let d = fclone(minfo);
220 try!(d.set_filter(channel, ys, preamp)); 220 r#try!(d.set_filter(channel, ys, preamp));
221 let rm = minfo.msg.method_return(); 221 let rm = minfo.msg.method_return();
222 Ok(vec!(rm)) 222 Ok(vec!(rm))
223 }; 223 };
@@ -230,9 +230,9 @@ where
230 let fclone = f.clone(); 230 let fclone = f.clone();
231 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 231 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
232 let mut i = minfo.msg.iter_init(); 232 let mut i = minfo.msg.iter_init();
233 let channel: u32 = try!(i.read()); 233 let channel: u32 = r#try!(i.read());
234 let d = fclone(minfo); 234 let d = fclone(minfo);
235 let (ys, preamp) = try!(d.get_filter(channel)); 235 let (ys, preamp) = r#try!(d.get_filter(channel));
236 let rm = minfo.msg.method_return(); 236 let rm = minfo.msg.method_return();
237 let rm = rm.append1(ys); 237 let rm = rm.append1(ys);
238 let rm = rm.append1(preamp); 238 let rm = rm.append1(preamp);
@@ -247,7 +247,7 @@ where
247 let fclone = f.clone(); 247 let fclone = f.clone();
248 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 248 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
249 let d = fclone(minfo); 249 let d = fclone(minfo);
250 try!(d.save_state()); 250 r#try!(d.save_state());
251 let rm = minfo.msg.method_return(); 251 let rm = minfo.msg.method_return();
252 Ok(vec!(rm)) 252 Ok(vec!(rm))
253 }; 253 };
@@ -257,9 +257,9 @@ where
257 let fclone = f.clone(); 257 let fclone = f.clone();
258 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 258 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
259 let mut i = minfo.msg.iter_init(); 259 let mut i = minfo.msg.iter_init();
260 let channel: u32 = try!(i.read()); 260 let channel: u32 = r#try!(i.read());
261 let d = fclone(minfo); 261 let d = fclone(minfo);
262 let name = try!(d.base_profile(channel)); 262 let name = r#try!(d.base_profile(channel));
263 let rm = minfo.msg.method_return(); 263 let rm = minfo.msg.method_return();
264 let rm = rm.append1(name); 264 let rm = rm.append1(name);
265 Ok(vec!(rm)) 265 Ok(vec!(rm))
@@ -275,7 +275,7 @@ where
275 let p = p.on_get(move |a, pinfo| { 275 let p = p.on_get(move |a, pinfo| {
276 let minfo = pinfo.to_method_info(); 276 let minfo = pinfo.to_method_info();
277 let d = fclone(&minfo); 277 let d = fclone(&minfo);
278 a.append(try!(d.get_interface_revision())); 278 a.append(r#try!(d.get_interface_revision()));
279 Ok(()) 279 Ok(())
280 }); 280 });
281 let i = i.add_p(p); 281 let i = i.add_p(p);
@@ -286,7 +286,7 @@ where
286 let p = p.on_get(move |a, pinfo| { 286 let p = p.on_get(move |a, pinfo| {
287 let minfo = pinfo.to_method_info(); 287 let minfo = pinfo.to_method_info();
288 let d = fclone(&minfo); 288 let d = fclone(&minfo);
289 a.append(try!(d.get_sample_rate())); 289 a.append(r#try!(d.get_sample_rate()));
290 Ok(()) 290 Ok(())
291 }); 291 });
292 let i = i.add_p(p); 292 let i = i.add_p(p);
@@ -297,7 +297,7 @@ where
297 let p = p.on_get(move |a, pinfo| { 297 let p = p.on_get(move |a, pinfo| {
298 let minfo = pinfo.to_method_info(); 298 let minfo = pinfo.to_method_info();
299 let d = fclone(&minfo); 299 let d = fclone(&minfo);
300 a.append(try!(d.get_filter_sample_rate())); 300 a.append(r#try!(d.get_filter_sample_rate()));
301 Ok(()) 301 Ok(())
302 }); 302 });
303 let i = i.add_p(p); 303 let i = i.add_p(p);
@@ -308,7 +308,7 @@ where
308 let p = p.on_get(move |a, pinfo| { 308 let p = p.on_get(move |a, pinfo| {
309 let minfo = pinfo.to_method_info(); 309 let minfo = pinfo.to_method_info();
310 let d = fclone(&minfo); 310 let d = fclone(&minfo);
311 a.append(try!(d.get_nfilter_coefficients())); 311 a.append(r#try!(d.get_nfilter_coefficients()));
312 Ok(()) 312 Ok(())
313 }); 313 });
314 let i = i.add_p(p); 314 let i = i.add_p(p);
@@ -319,7 +319,7 @@ where
319 let p = p.on_get(move |a, pinfo| { 319 let p = p.on_get(move |a, pinfo| {
320 let minfo = pinfo.to_method_info(); 320 let minfo = pinfo.to_method_info();
321 let d = fclone(&minfo); 321 let d = fclone(&minfo);
322 a.append(try!(d.get_nchannels())); 322 a.append(r#try!(d.get_nchannels()));
323 Ok(()) 323 Ok(())
324 }); 324 });
325 let i = i.add_p(p); 325 let i = i.add_p(p);
@@ -392,22 +392,22 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgPulseAudioCore1Device
392 type Err = dbus::Error; 392 type Err = dbus::Error;
393 393
394 fn suspend(&self, suspend: bool) -> Result<(), Self::Err> { 394 fn suspend(&self, suspend: bool) -> Result<(), Self::Err> {
395 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Core1.Device".into(), &"Suspend".into(), |msg| { 395 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Core1.Device".into(), &"Suspend".into(), |msg| {
396 let mut i = arg::IterAppend::new(msg); 396 let mut i = arg::IterAppend::new(msg);
397 i.append(suspend); 397 i.append(suspend);
398 })); 398 }));
399 try!(m.as_result()); 399 r#try!(m.as_result());
400 Ok(()) 400 Ok(())
401 } 401 }
402 402
403 fn get_port_by_name(&self, name: &str) -> Result<dbus::Path<'static>, Self::Err> { 403 fn get_port_by_name(&self, name: &str) -> Result<dbus::Path<'static>, Self::Err> {
404 let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Core1.Device".into(), &"GetPortByName".into(), |msg| { 404 let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Core1.Device".into(), &"GetPortByName".into(), |msg| {
405 let mut i = arg::IterAppend::new(msg); 405 let mut i = arg::IterAppend::new(msg);
406 i.append(name); 406 i.append(name);
407 })); 407 }));
408 try!(m.as_result()); 408 r#try!(m.as_result());
409 let mut i = m.iter_init(); 409 let mut i = m.iter_init();
410 let port: dbus::Path<'static> = try!(i.read()); 410 let port: dbus::Path<'static> = r#try!(i.read());
411 Ok(port) 411 Ok(port)
412 } 412 }
413 413
@@ -537,9 +537,9 @@ where
537 let fclone = f.clone(); 537 let fclone = f.clone();
538 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 538 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
539 let mut i = minfo.msg.iter_init(); 539 let mut i = minfo.msg.iter_init();
540 let suspend: bool = try!(i.read()); 540 let suspend: bool = r#try!(i.read());
541 let d = fclone(minfo); 541 let d = fclone(minfo);
542 try!(d.suspend(suspend)); 542 r#try!(d.suspend(suspend));
543 let rm = minfo.msg.method_return(); 543 let rm = minfo.msg.method_return();
544 Ok(vec!(rm)) 544 Ok(vec!(rm))
545 }; 545 };
@@ -550,9 +550,9 @@ where
550 let fclone = f.clone(); 550 let fclone = f.clone();
551 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 551 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
552 let mut i = minfo.msg.iter_init(); 552 let mut i = minfo.msg.iter_init();
553 let name: &str = try!(i.read()); 553 let name: &str = r#try!(i.read());
554 let d = fclone(minfo); 554 let d = fclone(minfo);
555 let port = try!(d.get_port_by_name(name)); 555 let port = r#try!(d.get_port_by_name(name));
556 let rm = minfo.msg.method_return(); 556 let rm = minfo.msg.method_return();
557 let rm = rm.append1(port); 557 let rm = rm.append1(port);
558 Ok(vec!(rm)) 558 Ok(vec!(rm))
@@ -568,7 +568,7 @@ where
568 let p = p.on_get(move |a, pinfo| { 568 let p = p.on_get(move |a, pinfo| {
569 let minfo = pinfo.to_method_info(); 569 let minfo = pinfo.to_method_info();
570 let d = fclone(&minfo); 570 let d = fclone(&minfo);
571 a.append(try!(d.get_index())); 571 a.append(r#try!(d.get_index()));
572 Ok(()) 572 Ok(())
573 }); 573 });
574 let i = i.add_p(p); 574 let i = i.add_p(p);
@@ -579,7 +579,7 @@ where
579 let p = p.on_get(move |a, pinfo| { 579 let p = p.on_get(move |a, pinfo| {
580 let minfo = pinfo.to_method_info(); 580 let minfo = pinfo.to_method_info();
581 let d = fclone(&minfo); 581 let d = fclone(&minfo);
582 a.append(try!(d.get_name())); 582 a.append(r#try!(d.get_name()));
583 Ok(()) 583 Ok(())
584 }); 584 });
585 let i = i.add_p(p); 585 let i = i.add_p(p);
@@ -590,7 +590,7 @@ where
590 let p = p.on_get(move |a, pinfo| { 590 let p = p.on_get(move |a, pinfo| {
591 let minfo = pinfo.to_method_info(); 591 let minfo = pinfo.to_method_info();
592 let d = fclone(&minfo); 592 let d = fclone(&minfo);
593 a.append(try!(d.get_driver())); 593 a.append(r#try!(d.get_driver()));
594 Ok(()) 594 Ok(())
595 }); 595 });
596 let i = i.add_p(p); 596 let i = i.add_p(p);
@@ -601,7 +601,7 @@ where
601 let p = p.on_get(move |a, pinfo| { 601 let p = p.on_get(move |a, pinfo| {
602 let minfo = pinfo.to_method_info(); 602 let minfo = pinfo.to_method_info();
603 let d = fclone(&minfo); 603 let d = fclone(&minfo);
604 a.append(try!(d.get_owner_module())); 604 a.append(r#try!(d.get_owner_module()));
605 Ok(()) 605 Ok(())
606 }); 606 });
607 let i = i.add_p(p); 607 let i = i.add_p(p);
@@ -612,7 +612,7 @@ where
612 let p = p.on_get(move |a, pinfo| { 612 let p = p.on_get(move |a, pinfo| {
613 let minfo = pinfo.to_method_info(); 613 let minfo = pinfo.to_method_info();
614 let d = fclone(&minfo); 614 let d = fclone(&minfo);
615 a.append(try!(d.get_card())); 615 a.append(r#try!(d.get_card()));
616 Ok(()) 616 Ok(())
617 }); 617 });
618 let i = i.add_p(p); 618 let i = i.add_p(p);
@@ -623,7 +623,7 @@ where
623 let p = p.on_get(move |a, pinfo| { 623 let p = p.on_get(move |a, pinfo| {
624 let minfo = pinfo.to_method_info(); 624 let minfo = pinfo.to_method_info();
625 let d = fclone(&minfo); 625 let d = fclone(&minfo);
626 a.append(try!(d.get_sample_format())); 626 a.append(r#try!(d.get_sample_format()));
627 Ok(()) 627 Ok(())
628 }); 628 });
629 let i = i.add_p(p); 629 let i = i.add_p(p);
@@ -634,7 +634,7 @@ where
634 let p = p.on_get(move |a, pinfo| { 634 let p = p.on_get(move |a, pinfo| {
635 let minfo = pinfo.to_method_info(); 635 let minfo = pinfo.to_method_info();
636 let d = fclone(&minfo); 636 let d = fclone(&minfo);
637 a.append(try!(d.get_sample_rate())); 637 a.append(r#try!(d.get_sample_rate()));
638 Ok(()) 638 Ok(())
639 }); 639 });
640 let i = i.add_p(p); 640 let i = i.add_p(p);
@@ -645,7 +645,7 @@ where
645 let p = p.on_get(move |a, pinfo| { 645 let p = p.on_get(move |a, pinfo| {
646 let minfo = pinfo.to_method_info(); 646 let minfo = pinfo.to_method_info();
647 let d = fclone(&minfo); 647 let d = fclone(&minfo);
648 a.append(try!(d.get_channels())); 648 a.append(r#try!(d.get_channels()));
649 Ok(()) 649 Ok(())
650 }); 650 });
651 let i = i.add_p(p); 651 let i = i.add_p(p);
@@ -656,14 +656,14 @@ where
656 let p = p.on_get(move |a, pinfo| { 656 let p = p.on_get(move |a, pinfo| {
657 let minfo = pinfo.to_method_info(); 657 let minfo = pinfo.to_method_info();
658 let d = fclone(&minfo); 658 let d = fclone(&minfo);
659 a.append(try!(d.get_volume())); 659 a.append(r#try!(d.get_volume()));
660 Ok(()) 660 Ok(())
661 }); 661 });
662 let fclone = f.clone(); 662 let fclone = f.clone();
663 let p = p.on_set(move |iter, pinfo| { 663 let p = p.on_set(move |iter, pinfo| {
664 let minfo = pinfo.to_method_info(); 664 let minfo = pinfo.to_method_info();
665 let d = fclone(&minfo); 665 let d = fclone(&minfo);
666 try!(d.set_volume(try!(iter.read()))); 666 r#try!(d.set_volume(r#try!(iter.read())));
667 Ok(()) 667 Ok(())
668 }); 668 });
669 let i = i.add_p(p); 669 let i = i.add_p(p);
@@ -674,7 +674,7 @@ where
674 let p = p.on_get(move |a, pinfo| { 674 let p = p.on_get(move |a, pinfo| {
675 let minfo = pinfo.to_method_info(); 675 let minfo = pinfo.to_method_info();
676 let d = fclone(&minfo); 676 let d = fclone(&minfo);
677 a.append(try!(d.get_has_flat_volume())); 677 a.append(r#try!(d.get_has_flat_volume()));
678 Ok(()) 678 Ok(())
679 }); 679 });
680 let i = i.add_p(p); 680 let i = i.add_p(p);
@@ -685,7 +685,7 @@ where
685 let p = p.on_get(move |a, pinfo| { 685 let p = p.on_get(move |a, pinfo| {
686 let minfo = pinfo.to_method_info(); 686 let minfo = pinfo.to_method_info();
687 let d = fclone(&minfo); 687 let d = fclone(&minfo);
688 a.append(try!(d.get_has_convertible_to_decibel_volume())); 688 a.append(r#try!(d.get_has_convertible_to_decibel_volume()));
689 Ok(()) 689 Ok(())
690 }); 690 });
691 let i = i.add_p(p); 691 let i = i.add_p(p);
@@ -696,7 +696,7 @@ where
696 let p = p.on_get(move |a, pinfo| { 696 let p = p.on_get(move |a, pinfo| {
697 let minfo = pinfo.to_method_info(); 697 let minfo = pinfo.to_method_info();
698 let d = fclone(&minfo); 698 let d = fclone(&minfo);
699 a.append(try!(d.get_base_volume())); 699 a.append(r#try!(d.get_base_volume()));
700 Ok(()) 700 Ok(())
701 }); 701 });
702 let i = i.add_p(p); 702 let i = i.add_p(p);
@@ -707,7 +707,7 @@ where
707 let p = p.on_get(move |a, pinfo| { 707 let p = p.on_get(move |a, pinfo| {
708 let minfo = pinfo.to_method_info(); 708 let minfo = pinfo.to_method_info();
709 let d = fclone(&minfo); 709 let d = fclone(&minfo);
710 a.append(try!(d.get_volume_steps())); 710 a.append(r#try!(d.get_volume_steps()));
711 Ok(()) 711 Ok(())
712 }); 712 });
713 let i = i.add_p(p); 713 let i = i.add_p(p);
@@ -718,14 +718,14 @@ where
718 let p = p.on_get(move |a, pinfo| { 718 let p = p.on_get(move |a, pinfo| {
719 let minfo = pinfo.to_method_info(); 719 let minfo = pinfo.to_method_info();
720 let d = fclone(&minfo); 720 let d = fclone(&minfo);
721 a.append(try!(d.get_mute())); 721 a.append(r#try!(d.get_mute()));
722 Ok(()) 722 Ok(())
723 }); 723 });
724 let fclone = f.clone(); 724 let fclone = f.clone();
725 let p = p.on_set(move |iter, pinfo| { 725 let p = p.on_set(move |iter, pinfo| {
726 let minfo = pinfo.to_method_info(); 726 let minfo = pinfo.to_method_info();
727 let d = fclone(&minfo); 727 let d = fclone(&minfo);
728 try!(d.set_mute(try!(iter.read()))); 728 r#try!(d.set_mute(r#try!(iter.read())));
729 Ok(()) 729 Ok(())
730 }); 730 });
731 let i = i.add_p(p); 731 let i = i.add_p(p);
@@ -736,7 +736,7 @@ where
736 let p = p.on_get(move |a, pinfo| { 736 let p = p.on_get(move |a, pinfo| {
737 let minfo = pinfo.to_method_info(); 737 let minfo = pinfo.to_method_info();
738 let d = fclone(&minfo); 738 let d = fclone(&minfo);
739 a.append(try!(d.get_has_hardware_volume())); 739 a.append(r#try!(d.get_has_hardware_volume()));
740 Ok(()) 740 Ok(())
741 }); 741 });
742 let i = i.add_p(p); 742 let i = i.add_p(p);
@@ -747,7 +747,7 @@ where
747 let p = p.on_get(move |a, pinfo| { 747 let p = p.on_get(move |a, pinfo| {
748 let minfo = pinfo.to_method_info(); 748 let minfo = pinfo.to_method_info();
749 let d = fclone(&minfo); 749 let d = fclone(&minfo);
750 a.append(try!(d.get_has_hardware_mute())); 750 a.append(r#try!(d.get_has_hardware_mute()));
751 Ok(()) 751 Ok(())
752 }); 752 });
753 let i = i.add_p(p); 753 let i = i.add_p(p);
@@ -758,7 +758,7 @@ where
758 let p = p.on_get(move |a, pinfo| { 758 let p = p.on_get(move |a, pinfo| {
759 let minfo = pinfo.to_method_info(); 759 let minfo = pinfo.to_method_info();
760 let d = fclone(&minfo); 760 let d = fclone(&minfo);
761 a.append(try!(d.get_configured_latency())); 761 a.append(r#try!(d.get_configured_latency()));
762 Ok(()) 762 Ok(())
763 }); 763 });
764 let i = i.add_p(p); 764 let i = i.add_p(p);
@@ -769,7 +769,7 @@ where
769 let p = p.on_get(move |a, pinfo| { 769 let p = p.on_get(move |a, pinfo| {
770 let minfo = pinfo.to_method_info(); 770 let minfo = pinfo.to_method_info();
771 let d = fclone(&minfo); 771 let d = fclone(&minfo);
772 a.append(try!(d.get_has_dynamic_latency())); 772 a.append(r#try!(d.get_has_dynamic_latency()));
773 Ok(()) 773 Ok(())
774 }); 774 });
775 let i = i.add_p(p); 775 let i = i.add_p(p);
@@ -780,7 +780,7 @@ where
780 let p = p.on_get(move |a, pinfo| { 780 let p = p.on_get(move |a, pinfo| {
781 let minfo = pinfo.to_method_info(); 781 let minfo = pinfo.to_method_info();
782 let d = fclone(&minfo); 782 let d = fclone(&minfo);
783 a.append(try!(d.get_latency())); 783 a.append(r#try!(d.get_latency()));
784 Ok(()) 784 Ok(())
785 }); 785 });
786 let i = i.add_p(p); 786 let i = i.add_p(p);
@@ -791,7 +791,7 @@ where
791 let p = p.on_get(move |a, pinfo| { 791 let p = p.on_get(move |a, pinfo| {
792 let minfo = pinfo.to_method_info(); 792 let minfo = pinfo.to_method_info();
793 let d = fclone(&minfo); 793 let d = fclone(&minfo);
794 a.append(try!(d.get_is_hardware_device())); 794 a.append(r#try!(d.get_is_hardware_device()));
795 Ok(()) 795 Ok(())
796 }); 796 });
797 let i = i.add_p(p); 797 let i = i.add_p(p);
@@ -802,7 +802,7 @@ where
802 let p = p.on_get(move |a, pinfo| { 802 let p = p.on_get(move |a, pinfo| {
803 let minfo = pinfo.to_method_info(); 803 let minfo = pinfo.to_method_info();
804 let d = fclone(&minfo); 804 let d = fclone(&minfo);
805 a.append(try!(d.get_is_network_device())); 805 a.append(r#try!(d.get_is_network_device()));
806 Ok(()) 806 Ok(())
807 }); 807 });
808 let i = i.add_p(p); 808 let i = i.add_p(p);
@@ -813,7 +813,7 @@ where
813 let p = p.on_get(move |a, pinfo| { 813 let p = p.on_get(move |a, pinfo| {
814 let minfo = pinfo.to_method_info(); 814 let minfo = pinfo.to_method_info();
815 let d = fclone(&minfo); 815 let d = fclone(&minfo);
816 a.append(try!(d.get_state())); 816 a.append(r#try!(d.get_state()));
817 Ok(()) 817 Ok(())
818 }); 818 });
819 let i = i.add_p(p); 819 let i = i.add_p(p);
@@ -824,7 +824,7 @@ where
824 let p = p.on_get(move |a, pinfo| { 824 let p = p.on_get(move |a, pinfo| {
825 let minfo = pinfo.to_method_info(); 825 let minfo = pinfo.to_method_info();
826 let d = fclone(&minfo); 826 let d = fclone(&minfo);
827 a.append(try!(d.get_ports())); 827 a.append(r#try!(d.get_ports()));
828 Ok(()) 828 Ok(())
829 }); 829 });
830 let i = i.add_p(p); 830 let i = i.add_p(p);
@@ -835,14 +835,14 @@ where
835 let p = p.on_get(move |a, pinfo| { 835 let p = p.on_get(move |a, pinfo| {
836 let minfo = pinfo.to_method_info(); 836 let minfo = pinfo.to_method_info();
837 let d = fclone(&minfo); 837 let d = fclone(&minfo);
838 a.append(try!(d.get_active_port())); 838 a.append(r#try!(d.get_active_port()));
839 Ok(()) 839 Ok(())
840 }); 840 });
841 let fclone = f.clone(); 841 let fclone = f.clone();
842 let p = p.on_set(move |iter, pinfo| { 842 let p = p.on_set(move |iter, pinfo| {
843 let minfo = pinfo.to_method_info(); 843 let minfo = pinfo.to_method_info();
844 let d = fclone(&minfo); 844 let d = fclone(&minfo);
845 try!(d.set_active_port(try!(iter.read()))); 845 r#try!(d.set_active_port(r#try!(iter.read())));
846 Ok(()) 846 Ok(())
847 }); 847 });
848 let i = i.add_p(p); 848 let i = i.add_p(p);
@@ -853,7 +853,7 @@ where
853 let p = p.on_get(move |a, pinfo| { 853 let p = p.on_get(move |a, pinfo| {
854 let minfo = pinfo.to_method_info(); 854 let minfo = pinfo.to_method_info();
855 let d = fclone(&minfo); 855 let d = fclone(&minfo);
856 a.append(try!(d.get_property_list())); 856 a.append(r#try!(d.get_property_list()));
857 Ok(()) 857 Ok(())
858 }); 858 });
859 let i = i.add_p(p); 859 let i = i.add_p(p);
@@ -872,7 +872,7 @@ impl dbus::SignalArgs for OrgPulseAudioCore1DeviceVolumeUpdated {
872 (&self.volume as &arg::RefArg).append(i); 872 (&self.volume as &arg::RefArg).append(i);
873 } 873 }
874 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 874 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
875 self.volume = try!(i.read()); 875 self.volume = r#try!(i.read());
876 Ok(()) 876 Ok(())
877 } 877 }
878} 878}
@@ -889,7 +889,7 @@ impl dbus::SignalArgs for OrgPulseAudioCore1DeviceMuteUpdated {
889 (&self.muted as &arg::RefArg).append(i); 889 (&self.muted as &arg::RefArg).append(i);
890 } 890 }
891 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 891 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
892 self.muted = try!(i.read()); 892 self.muted = r#try!(i.read());
893 Ok(()) 893 Ok(())
894 } 894 }
895} 895}
@@ -906,7 +906,7 @@ impl dbus::SignalArgs for OrgPulseAudioCore1DeviceStateUpdated {
906 (&self.state as &arg::RefArg).append(i); 906 (&self.state as &arg::RefArg).append(i);
907 } 907 }
908 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 908 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
909 self.state = try!(i.read()); 909 self.state = r#try!(i.read());
910 Ok(()) 910 Ok(())
911 } 911 }
912} 912}
@@ -923,7 +923,7 @@ impl dbus::SignalArgs for OrgPulseAudioCore1DeviceActivePortUpdated {
923 (&self.port as &arg::RefArg).append(i); 923 (&self.port as &arg::RefArg).append(i);
924 } 924 }
925 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 925 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
926 self.port = try!(i.read()); 926 self.port = r#try!(i.read());
927 Ok(()) 927 Ok(())
928 } 928 }
929} 929}
@@ -940,7 +940,7 @@ impl dbus::SignalArgs for OrgPulseAudioCore1DevicePropertyListUpdated {
940 (&self.property_list as &arg::RefArg).append(i); 940 (&self.property_list as &arg::RefArg).append(i);
941 } 941 }
942 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { 942 fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
943 self.property_list = try!(i.read()); 943 self.property_list = r#try!(i.read());
944 Ok(()) 944 Ok(())
945 } 945 }
946} 946}
@@ -974,7 +974,7 @@ where
974 let p = p.on_get(move |a, pinfo| { 974 let p = p.on_get(move |a, pinfo| {
975 let minfo = pinfo.to_method_info(); 975 let minfo = pinfo.to_method_info();
976 let d = fclone(&minfo); 976 let d = fclone(&minfo);
977 a.append(try!(d.get_monitor_source())); 977 a.append(r#try!(d.get_monitor_source()));
978 Ok(()) 978 Ok(())
979 }); 979 });
980 let i = i.add_p(p); 980 let i = i.add_p(p);
@@ -990,11 +990,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusIntros
990 type Err = dbus::Error; 990 type Err = dbus::Error;
991 991
992 fn introspect(&self) -> Result<String, Self::Err> { 992 fn introspect(&self) -> Result<String, Self::Err> {
993 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { 993 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| {
994 })); 994 }));
995 try!(m.as_result()); 995 r#try!(m.as_result());
996 let mut i = m.iter_init(); 996 let mut i = m.iter_init();
997 let data: String = try!(i.read()); 997 let data: String = r#try!(i.read());
998 Ok(data) 998 Ok(data)
999 } 999 }
1000} 1000}
@@ -1011,7 +1011,7 @@ where
1011 let fclone = f.clone(); 1011 let fclone = f.clone();
1012 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 1012 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
1013 let d = fclone(minfo); 1013 let d = fclone(minfo);
1014 let data = try!(d.introspect()); 1014 let data = r#try!(d.introspect());
1015 let rm = minfo.msg.method_return(); 1015 let rm = minfo.msg.method_return();
1016 let rm = rm.append1(data); 1016 let rm = rm.append1(data);
1017 Ok(vec!(rm)) 1017 Ok(vec!(rm))
@@ -1033,36 +1033,36 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
1033 type Err = dbus::Error; 1033 type Err = dbus::Error;
1034 1034
1035 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> { 1035 fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
1036 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { 1036 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| {
1037 let mut i = arg::IterAppend::new(msg); 1037 let mut i = arg::IterAppend::new(msg);
1038 i.append(interface_name); 1038 i.append(interface_name);
1039 i.append(property_name); 1039 i.append(property_name);
1040 })); 1040 }));
1041 try!(m.as_result()); 1041 r#try!(m.as_result());
1042 let mut i = m.iter_init(); 1042 let mut i = m.iter_init();
1043 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 1043 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
1044 Ok(value) 1044 Ok(value)
1045 } 1045 }
1046 1046
1047 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> { 1047 fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
1048 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { 1048 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| {
1049 let mut i = arg::IterAppend::new(msg); 1049 let mut i = arg::IterAppend::new(msg);
1050 i.append(interface_name); 1050 i.append(interface_name);
1051 i.append(property_name); 1051 i.append(property_name);
1052 i.append(value); 1052 i.append(value);
1053 })); 1053 }));
1054 try!(m.as_result()); 1054 r#try!(m.as_result());
1055 Ok(()) 1055 Ok(())
1056 } 1056 }
1057 1057
1058 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> { 1058 fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
1059 let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { 1059 let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| {
1060 let mut i = arg::IterAppend::new(msg); 1060 let mut i = arg::IterAppend::new(msg);
1061 i.append(interface_name); 1061 i.append(interface_name);
1062 })); 1062 }));
1063 try!(m.as_result()); 1063 r#try!(m.as_result());
1064 let mut i = m.iter_init(); 1064 let mut i = m.iter_init();
1065 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = try!(i.read()); 1065 let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
1066 Ok(props) 1066 Ok(props)
1067 } 1067 }
1068} 1068}
@@ -1079,10 +1079,10 @@ where
1079 let fclone = f.clone(); 1079 let fclone = f.clone();
1080 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 1080 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
1081 let mut i = minfo.msg.iter_init(); 1081 let mut i = minfo.msg.iter_init();
1082 let interface_name: &str = try!(i.read()); 1082 let interface_name: &str = r#try!(i.read());
1083 let property_name: &str = try!(i.read()); 1083 let property_name: &str = r#try!(i.read());
1084 let d = fclone(minfo); 1084 let d = fclone(minfo);
1085 let value = try!(d.get(interface_name, property_name)); 1085 let value = r#try!(d.get(interface_name, property_name));
1086 let rm = minfo.msg.method_return(); 1086 let rm = minfo.msg.method_return();
1087 let rm = rm.append1(value); 1087 let rm = rm.append1(value);
1088 Ok(vec!(rm)) 1088 Ok(vec!(rm))
@@ -1096,11 +1096,11 @@ where
1096 let fclone = f.clone(); 1096 let fclone = f.clone();
1097 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 1097 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
1098 let mut i = minfo.msg.iter_init(); 1098 let mut i = minfo.msg.iter_init();
1099 let interface_name: &str = try!(i.read()); 1099 let interface_name: &str = r#try!(i.read());
1100 let property_name: &str = try!(i.read()); 1100 let property_name: &str = r#try!(i.read());
1101 let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); 1101 let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
1102 let d = fclone(minfo); 1102 let d = fclone(minfo);
1103 try!(d.set(interface_name, property_name, value)); 1103 r#try!(d.set(interface_name, property_name, value));
1104 let rm = minfo.msg.method_return(); 1104 let rm = minfo.msg.method_return();
1105 Ok(vec!(rm)) 1105 Ok(vec!(rm))
1106 }; 1106 };
@@ -1113,9 +1113,9 @@ where
1113 let fclone = f.clone(); 1113 let fclone = f.clone();
1114 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { 1114 let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
1115 let mut i = minfo.msg.iter_init(); 1115 let mut i = minfo.msg.iter_init();
1116 let interface_name: &str = try!(i.read()); 1116 let interface_name: &str = r#try!(i.read());
1117 let d = fclone(minfo); 1117 let d = fclone(minfo);
1118 let props = try!(d.get_all(interface_name)); 1118 let props = r#try!(d.get_all(interface_name));
1119 let rm = minfo.msg.method_return(); 1119 let rm = minfo.msg.method_return();
1120 let rm = rm.append1(props); 1120 let rm = rm.append1(props);
1121 Ok(vec!(rm)) 1121 Ok(vec!(rm))
diff --git a/src/pa_eq/mod.rs b/src/pa_eq/mod.rs
index 797468f..9073684 100644
--- a/src/pa_eq/mod.rs
+++ b/src/pa_eq/mod.rs
@@ -1,8 +1,8 @@
1mod dbus_api; 1mod dbus_api;
2 2
3use cli::pa_eq::*; 3use crate::cli::pa_eq::*;
4use utils::*; 4use crate::utils::*;
5use Filter; 5use crate::Filter;
6 6
7use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager; 7use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager;
8use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1; 8use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1;
@@ -17,7 +17,7 @@ use failure::{Error, ResultExt};
17struct NoEqualizedSink; 17struct NoEqualizedSink;
18 18
19pub fn main(cmd: Command) -> Result<(), Error> { 19pub fn main(cmd: Command) -> Result<(), Error> {
20 use cli::pa_eq::Command::*; 20 use crate::cli::pa_eq::Command::*;
21 21
22 warn!("The PulseAudio equalizer has been deprecated for a while, and is known to sometimes cause crashes, latency or audible artifacts"); 22 warn!("The PulseAudio equalizer has been deprecated for a while, and is known to sometimes cause crashes, latency or audible artifacts");
23 23
diff --git a/src/utils.rs b/src/utils.rs
index b966a3b..2e585b0 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,7 +1,7 @@
1use Filter; 1use crate::Filter;
2 2
3use cli::EqualizerConfFormat; 3use crate::cli::EqualizerConfFormat;
4use parsing::EqualizerApoParser; 4use crate::parsing::EqualizerApoParser;
5 5
6use failure::Error; 6use failure::Error;
7use lalrpop_util; 7use lalrpop_util;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 15:15:23 +0000