Chore: Clippy fixes to match new MSRV.
This commit is contained in:
@@ -75,10 +75,7 @@ impl Connection {
|
|||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let value = match client.recv_json().await? {
|
let Some(value) = client.recv_json().await? else { continue };
|
||||||
Some(value) => value,
|
|
||||||
None => continue,
|
|
||||||
};
|
|
||||||
|
|
||||||
match value {
|
match value {
|
||||||
GatewayEvent::Ready(r) => {
|
GatewayEvent::Ready(r) => {
|
||||||
@@ -282,10 +279,7 @@ impl Connection {
|
|||||||
let mut resumed = None;
|
let mut resumed = None;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let value = match client.recv_json().await? {
|
let Some(value) = client.recv_json().await? else { continue };
|
||||||
Some(value) => value,
|
|
||||||
None => continue,
|
|
||||||
};
|
|
||||||
|
|
||||||
match value {
|
match value {
|
||||||
GatewayEvent::Resumed => {
|
GatewayEvent::Resumed => {
|
||||||
@@ -337,10 +331,7 @@ fn generate_url(endpoint: &mut String) -> Result<Url> {
|
|||||||
#[inline]
|
#[inline]
|
||||||
async fn init_cipher(client: &mut WsStream, mode: CryptoMode) -> Result<Cipher> {
|
async fn init_cipher(client: &mut WsStream, mode: CryptoMode) -> Result<Cipher> {
|
||||||
loop {
|
loop {
|
||||||
let value = match client.recv_json().await? {
|
let Some(value) = client.recv_json().await? else { continue };
|
||||||
Some(value) => value,
|
|
||||||
None => continue,
|
|
||||||
};
|
|
||||||
|
|
||||||
match value {
|
match value {
|
||||||
GatewayEvent::SessionDescription(desc) => {
|
GatewayEvent::SessionDescription(desc) => {
|
||||||
|
|||||||
@@ -427,7 +427,7 @@ impl Live {
|
|||||||
|
|
||||||
if let Some((id, parked)) = self.remove_task(i) {
|
if let Some((id, parked)) = self.remove_task(i) {
|
||||||
self.global_stats.move_mixer_to_idle();
|
self.global_stats.move_mixer_to_idle();
|
||||||
let _ = self.tx.send(SchedulerMessage::Demote(id, parked));
|
_ = self.tx.send(SchedulerMessage::Demote(id, parked));
|
||||||
} else {
|
} else {
|
||||||
self.global_stats.remove_live_mixer();
|
self.global_stats.remove_live_mixer();
|
||||||
}
|
}
|
||||||
@@ -445,7 +445,7 @@ impl Live {
|
|||||||
if let Some((id, mut parked)) = self.remove_task(idx) {
|
if let Some((id, mut parked)) = self.remove_task(idx) {
|
||||||
self.global_stats.move_mixer_to_idle();
|
self.global_stats.move_mixer_to_idle();
|
||||||
parked.last_cost = Some(cost);
|
parked.last_cost = Some(cost);
|
||||||
let _ = self
|
_ = self
|
||||||
.tx
|
.tx
|
||||||
.send(SchedulerMessage::Overspill(self.id, id, parked));
|
.send(SchedulerMessage::Overspill(self.id, id, parked));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -821,7 +821,7 @@ impl Mixer {
|
|||||||
input,
|
input,
|
||||||
mix_state,
|
mix_state,
|
||||||
vol,
|
vol,
|
||||||
do_passthrough.then(|| &mut *opus_frame),
|
do_passthrough.then_some(&mut *opus_frame),
|
||||||
);
|
);
|
||||||
|
|
||||||
let return_here = if let MixType::MixedPcm(pcm_len) = mix_type {
|
let return_here = if let MixType::MixedPcm(pcm_len) = mix_type {
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ impl UdpRx {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let _ = self.ssrc_signalling.disconnected_users.remove(&id);
|
_ = self.ssrc_signalling.disconnected_users.remove(&id);
|
||||||
if let Some((_, ssrc)) = self.ssrc_signalling.user_ssrc_map.remove(&id) {
|
if let Some((_, ssrc)) = self.ssrc_signalling.user_ssrc_map.remove(&id) {
|
||||||
if let Some(state) = self.decoder_map.get_mut(&ssrc) {
|
if let Some(state) = self.decoder_map.get_mut(&ssrc) {
|
||||||
// don't cleanup immediately: leave for later cycle
|
// don't cleanup immediately: leave for later cycle
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ impl Call {
|
|||||||
#[cfg(feature = "driver")]
|
#[cfg(feature = "driver")]
|
||||||
Some((ConnectionProgress::Complete(c), Return::Conn(first_tx, driver_tx))) => {
|
Some((ConnectionProgress::Complete(c), Return::Conn(first_tx, driver_tx))) => {
|
||||||
// It's okay if the receiver hung up.
|
// It's okay if the receiver hung up.
|
||||||
let _ = first_tx.send(());
|
_ = first_tx.send(());
|
||||||
|
|
||||||
self.driver.raw_connect(c.clone(), driver_tx.clone());
|
self.driver.raw_connect(c.clone(), driver_tx.clone());
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -191,7 +191,7 @@ impl AsyncAdapterStream {
|
|||||||
self.resp_rx.try_recv().ok()
|
self.resp_rx.try_recv().ok()
|
||||||
};
|
};
|
||||||
|
|
||||||
let msg = if let Some(msg) = msg { msg } else { break None };
|
let Some(msg) = msg else { break None };
|
||||||
|
|
||||||
// state changes
|
// state changes
|
||||||
match &msg {
|
match &msg {
|
||||||
@@ -267,7 +267,7 @@ impl Seek for AsyncAdapterStream {
|
|||||||
|
|
||||||
self.check_dropped()?;
|
self.check_dropped()?;
|
||||||
|
|
||||||
let _ = self.req_tx.send(AdapterRequest::Seek(pos));
|
_ = self.req_tx.send(AdapterRequest::Seek(pos));
|
||||||
|
|
||||||
// wait for async to tell us that it has stopped writing,
|
// wait for async to tell us that it has stopped writing,
|
||||||
// then clear buf and allow async to write again.
|
// then clear buf and allow async to write again.
|
||||||
@@ -280,7 +280,7 @@ impl Seek for AsyncAdapterStream {
|
|||||||
|
|
||||||
self.bytes_out.skip(self.bytes_out.capacity());
|
self.bytes_out.skip(self.bytes_out.capacity());
|
||||||
|
|
||||||
let _ = self.req_tx.send(AdapterRequest::SeekCleared);
|
_ = self.req_tx.send(AdapterRequest::SeekCleared);
|
||||||
|
|
||||||
match self.handle_messages(Operation::Seek) {
|
match self.handle_messages(Operation::Seek) {
|
||||||
Some(AdapterResponse::SeekResult(a)) => a,
|
Some(AdapterResponse::SeekResult(a)) => a,
|
||||||
@@ -298,7 +298,7 @@ impl MediaSource for AsyncAdapterStream {
|
|||||||
fn byte_len(&self) -> Option<u64> {
|
fn byte_len(&self) -> Option<u64> {
|
||||||
self.check_dropped().ok()?;
|
self.check_dropped().ok()?;
|
||||||
|
|
||||||
let _ = self.req_tx.send(AdapterRequest::ByteLen);
|
_ = self.req_tx.send(AdapterRequest::ByteLen);
|
||||||
|
|
||||||
match self.handle_messages(Operation::Len) {
|
match self.handle_messages(Operation::Len) {
|
||||||
Some(AdapterResponse::ByteLen(a)) => a,
|
Some(AdapterResponse::ByteLen(a)) => a,
|
||||||
|
|||||||
@@ -156,9 +156,7 @@ impl Compressed {
|
|||||||
.await??;
|
.await??;
|
||||||
|
|
||||||
// If success, guaranteed to be Parsed
|
// If success, guaranteed to be Parsed
|
||||||
let mut parsed = if let LiveInput::Parsed(parsed) = promoted {
|
let LiveInput::Parsed(mut parsed) = promoted else {
|
||||||
parsed
|
|
||||||
} else {
|
|
||||||
unreachable!()
|
unreachable!()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -74,9 +74,7 @@ impl Decompressed {
|
|||||||
.await??;
|
.await??;
|
||||||
|
|
||||||
// If success, guaranteed to be Parsed
|
// If success, guaranteed to be Parsed
|
||||||
let parsed = if let LiveInput::Parsed(parsed) = promoted {
|
let LiveInput::Parsed(parsed) = promoted else {
|
||||||
parsed
|
|
||||||
} else {
|
|
||||||
unreachable!()
|
unreachable!()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ impl Decoder for OpusDecoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn reset(&mut self) {
|
fn reset(&mut self) {
|
||||||
let _ = self.inner.reset_state();
|
_ = self.inner.reset_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn finalize(&mut self) -> FinalizeResult {
|
fn finalize(&mut self) -> FinalizeResult {
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ use crate::events::TrackEvent;
|
|||||||
/// Playback status of a track.
|
/// Playback status of a track.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
|
#[derive(Default)]
|
||||||
pub enum PlayMode {
|
pub enum PlayMode {
|
||||||
/// The track is currently playing.
|
/// The track is currently playing.
|
||||||
|
#[default]
|
||||||
Play,
|
Play,
|
||||||
/// The track is currently paused, and may be resumed.
|
/// The track is currently paused, and may be resumed.
|
||||||
Pause,
|
Pause,
|
||||||
@@ -67,12 +69,6 @@ impl PlayMode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for PlayMode {
|
|
||||||
fn default() -> Self {
|
|
||||||
PlayMode::Play
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PartialEq for PlayMode {
|
impl PartialEq for PlayMode {
|
||||||
fn eq(&self, other: &Self) -> bool {
|
fn eq(&self, other: &Self) -> bool {
|
||||||
self.as_track_event() == other.as_track_event()
|
self.as_track_event() == other.as_track_event()
|
||||||
|
|||||||
Reference in New Issue
Block a user