resolve rust clippy 1.50 issues
The issue was with unnecessary lifetimes and nested match statements
that resolved quite cleanly in this change.
BUG=b:179277332
TEST=cargo clippy with rustc 1.50+
Change-Id: Ibbac7a46e2209d8262a2bd5d205b23793e096017
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2757729
Auto-Submit: Zach Reizner <zachr@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
diff --git a/audio_streams/src/shm_streams.rs b/audio_streams/src/shm_streams.rs
index 13475cd..b11626f 100644
--- a/audio_streams/src/shm_streams.rs
+++ b/audio_streams/src/shm_streams.rs
@@ -271,10 +271,10 @@
self.frame_rate
}
- fn wait_for_next_action_with_timeout<'a>(
- &'a mut self,
+ fn wait_for_next_action_with_timeout(
+ &mut self,
timeout: Duration,
- ) -> GenericResult<Option<ServerRequest<'a>>> {
+ ) -> GenericResult<Option<ServerRequest>> {
let elapsed = self.start_time.elapsed();
if elapsed < self.next_frame {
if timeout < self.next_frame - elapsed {
@@ -399,10 +399,10 @@
self.frame_rate
}
- fn wait_for_next_action_with_timeout<'a>(
- &'a mut self,
+ fn wait_for_next_action_with_timeout(
+ &mut self,
timeout: Duration,
- ) -> GenericResult<Option<ServerRequest<'a>>> {
+ ) -> GenericResult<Option<ServerRequest>> {
{
let start_time = Instant::now();
let &(ref lock, ref cvar) = &*self.request_notifier;
diff --git a/cras/client/libcras/src/cras_stream.rs b/cras/client/libcras/src/cras_stream.rs
index 5914bfd..f600480 100644
--- a/cras/client/libcras/src/cras_stream.rs
+++ b/cras/client/libcras/src/cras_stream.rs
@@ -165,20 +165,20 @@
fn wait_request_data(&mut self) -> Result<(), Error> {
match self.controls.audio_sock_mut().read_audio_message()? {
- AudioMessage::Success { id, .. } => match id {
- CRAS_AUDIO_MESSAGE_ID::AUDIO_MESSAGE_REQUEST_DATA => Ok(()),
- _ => Err(Error::MessageTypeError),
- },
+ AudioMessage::Success {
+ id: CRAS_AUDIO_MESSAGE_ID::AUDIO_MESSAGE_REQUEST_DATA,
+ ..
+ } => Ok(()),
_ => Err(Error::MessageTypeError),
}
}
fn wait_data_ready(&mut self) -> Result<u32, Error> {
match self.controls.audio_sock_mut().read_audio_message()? {
- AudioMessage::Success { id, frames } => match id {
- CRAS_AUDIO_MESSAGE_ID::AUDIO_MESSAGE_DATA_READY => Ok(frames),
- _ => Err(Error::MessageTypeError),
- },
+ AudioMessage::Success {
+ id: CRAS_AUDIO_MESSAGE_ID::AUDIO_MESSAGE_DATA_READY,
+ frames,
+ } => Ok(frames),
_ => Err(Error::MessageTypeError),
}
}