From 644355269e8825a4b6669fd2a058ae8d4be0e938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 21 Jan 2018 19:51:48 +0100 Subject: [PATCH] Use futures::sync::oneshot::Sender::send() instead of the deprecated complete() --- core/src/audio_key.rs | 4 ++-- core/src/mercury/mod.rs | 4 ++-- src/player.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/audio_key.rs b/core/src/audio_key.rs index 2d6a21ee..e19c5b87 100644 --- a/core/src/audio_key.rs +++ b/core/src/audio_key.rs @@ -32,11 +32,11 @@ impl AudioKeyManager { 0xd => { let mut key = [0u8; 16]; key.copy_from_slice(data.as_ref()); - sender.complete(Ok(AudioKey(key))); + let _ = sender.send(Ok(AudioKey(key))); } 0xe => { warn!("error audio key {:x} {:x}", data.as_ref()[0], data.as_ref()[1]); - sender.complete(Err(AudioKeyError)); + let _ = sender.send(Err(AudioKeyError)); } _ => (), } diff --git a/core/src/mercury/mod.rs b/core/src/mercury/mod.rs index 2bf52a11..23a3224e 100644 --- a/core/src/mercury/mod.rs +++ b/core/src/mercury/mod.rs @@ -199,7 +199,7 @@ impl MercuryManager { if response.status_code >= 400 { warn!("error {} for uri {}", response.status_code, &response.uri); if let Some(cb) = pending.callback { - cb.complete(Err(MercuryError)); + let _ = cb.send(Err(MercuryError)); } } else { if cmd == 0xb5 { @@ -223,7 +223,7 @@ impl MercuryManager { } }) } else if let Some(cb) = pending.callback { - cb.complete(Ok(response)); + let _ = cb.send(Ok(response)); } } } diff --git a/src/player.rs b/src/player.rs index 94df2e1c..ffffa130 100644 --- a/src/player.rs +++ b/src/player.rs @@ -155,7 +155,7 @@ impl PlayerState { match self { Paused { end_of_track, .. } | Playing { end_of_track, .. } => { - end_of_track.complete(()) + let _ = end_of_track.send(()); } Stopped => warn!("signal_end_of_track from stopped state"), @@ -313,7 +313,7 @@ impl PlayerInternal { } None => { - end_of_track.complete(()); + let _ = end_of_track.send(()); if self.state.is_playing() { self.run_onstop(); }