Merge pull request #691 from kawogi/edition-2021

Fix some Edition 2021 warnings/errors
This commit is contained in:
est31 2022-09-20 22:27:45 +02:00 • committed by GitHub
commit f19ceeb8e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions

View file

@ -892,7 +892,7 @@ impl Stream {
let thread = thread::Builder::new() let thread = thread::Builder::new()
.name("cpal_alsa_in".to_owned()) .name("cpal_alsa_in".to_owned())
.spawn(move || { .spawn(move || {
input_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback); input_stream_worker(rx, &stream, &mut data_callback, &mut error_callback);
}) })
.unwrap(); .unwrap();
Stream { Stream {
@ -917,7 +917,7 @@ impl Stream {
let thread = thread::Builder::new() let thread = thread::Builder::new()
.name("cpal_alsa_out".to_owned()) .name("cpal_alsa_out".to_owned())
.spawn(move || { .spawn(move || {
output_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback); output_stream_worker(rx, &stream, &mut data_callback, &mut error_callback);
}) })
.unwrap(); .unwrap();
Stream { Stream {

View file

@ -4,18 +4,18 @@ pub type SupportedOutputConfigs = std::vec::IntoIter<SupportedStreamConfigRange>
use super::parking_lot::Mutex; use super::parking_lot::Mutex;
use super::sys; use super::sys;
use crate::BackendSpecificError;
use crate::DefaultStreamConfigError;
use crate::DeviceNameError;
use crate::DevicesError;
use crate::SampleFormat;
use crate::SampleRate;
use crate::SupportedBufferSize;
use crate::SupportedStreamConfig;
use crate::SupportedStreamConfigRange;
use crate::SupportedStreamConfigsError;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::sync::Arc; use std::sync::Arc;
use BackendSpecificError;
use DefaultStreamConfigError;
use DeviceNameError;
use DevicesError;
use SampleFormat;
use SampleRate;
use SupportedBufferSize;
use SupportedStreamConfig;
use SupportedStreamConfigRange;
use SupportedStreamConfigsError;
/// A ASIO Device /// A ASIO Device
pub struct Device { pub struct Device {
@ -68,7 +68,7 @@ impl Device {
// Collect a config for every combination of supported sample rate and number of channels. // Collect a config for every combination of supported sample rate and number of channels.
let mut supported_configs = vec![]; let mut supported_configs = vec![];
for &rate in ::COMMON_SAMPLE_RATES { for &rate in crate::COMMON_SAMPLE_RATES {
if !self if !self
.driver .driver
.can_sample_rate(rate.0.into()) .can_sample_rate(rate.0.into())
@ -105,7 +105,7 @@ impl Device {
// Collect a config for every combination of supported sample rate and number of channels. // Collect a config for every combination of supported sample rate and number of channels.
let mut supported_configs = vec![]; let mut supported_configs = vec![];
for &rate in ::COMMON_SAMPLE_RATES { for &rate in crate::COMMON_SAMPLE_RATES {
if !self if !self
.driver .driver
.can_sample_rate(rate.0.into()) .can_sample_rate(rate.0.into())

View file

@ -319,13 +319,13 @@ pub struct OutputStreamTimestamp {
} }
/// Information relevant to a single call to the user's input stream data callback. /// Information relevant to a single call to the user's input stream data callback.
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct InputCallbackInfo { pub struct InputCallbackInfo {
timestamp: InputStreamTimestamp, timestamp: InputStreamTimestamp,
} }
/// Information relevant to a single call to the user's output stream data callback. /// Information relevant to a single call to the user's output stream data callback.
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct OutputCallbackInfo { pub struct OutputCallbackInfo {
timestamp: OutputStreamTimestamp, timestamp: OutputStreamTimestamp,
} }