From e543ca1ef3e0ccbbf2ce89a700a03b040d6c05da Mon Sep 17 00:00:00 2001 From: atok Date: Mon, 8 Jan 2024 22:29:07 +0100 Subject: [PATCH] fmt --- symphonia-bundle-flac/src/lib.rs | 1 - symphonia-bundle-flac/src/validate.rs | 2 +- symphonia-bundle-mp3/src/demuxer.rs | 1 - symphonia-bundle-mp3/src/layer3/mod.rs | 2 +- symphonia-codec-aac/src/aac/codebooks.rs | 2 +- symphonia-core/src/audio.rs | 2 +- symphonia-core/src/dsp/fft.rs | 2 +- symphonia-core/src/dsp/mdct/simd.rs | 2 +- symphonia-core/src/dsp/mod.rs | 4 +-- symphonia-core/src/errors.rs | 11 +++---- symphonia-core/src/formats.rs | 8 ++--- symphonia-core/src/io/bit.rs | 12 +++---- symphonia-core/src/io/buf_reader.rs | 2 +- symphonia-core/src/io/media_source_stream.rs | 13 ++++---- symphonia-core/src/io/mod.rs | 34 ++++++++------------ symphonia-core/src/io/monitor_stream.rs | 1 - symphonia-core/src/io/scoped_stream.rs | 2 +- symphonia-core/src/lib.rs | 1 - symphonia-core/src/meta.rs | 6 ++-- symphonia-core/src/probe.rs | 8 ++--- symphonia-format-isomp4/src/stream.rs | 2 +- symphonia-format-mkv/src/demuxer.rs | 2 +- symphonia-format-mkv/src/ebml.rs | 6 ++-- symphonia-format-mkv/src/segment.rs | 2 +- symphonia-format-ogg/src/demuxer.rs | 2 +- symphonia-format-ogg/src/page.rs | 2 +- symphonia-format-ogg/src/physical.rs | 4 ++- symphonia-format-riff/src/common.rs | 2 +- symphonia-format-wav/src/chunks.rs | 4 +-- symphonia-format-wav/src/lib.rs | 6 ++-- symphonia-metadata/src/id3v2/frames.rs | 2 +- symphonia-metadata/src/itunes.rs | 1 - symphonia-metadata/src/lib.rs | 1 - symphonia-utils-xiph/src/flac/metadata.rs | 6 ++-- symphonia-utils-xiph/src/lib.rs | 1 - symphonia/src/lib.rs | 1 - 36 files changed, 75 insertions(+), 85 deletions(-) diff --git a/symphonia-bundle-flac/src/lib.rs b/symphonia-bundle-flac/src/lib.rs index 712b550f..d343fbe9 100644 --- a/symphonia-bundle-flac/src/lib.rs +++ b/symphonia-bundle-flac/src/lib.rs @@ -13,7 +13,6 @@ #![allow(clippy::excessive_precision)] #![allow(clippy::identity_op)] #![allow(clippy::manual_range_contains)] - #![no_std] extern crate alloc; diff --git a/symphonia-bundle-flac/src/validate.rs b/symphonia-bundle-flac/src/validate.rs index 0339f5f0..d58d87c8 100644 --- a/symphonia-bundle-flac/src/validate.rs +++ b/symphonia-bundle-flac/src/validate.rs @@ -5,8 +5,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use core::mem; use alloc::vec::Vec; +use core::mem; use symphonia_core::audio::{AudioBuffer, Signal}; use symphonia_core::checksum::Md5; diff --git a/symphonia-bundle-mp3/src/demuxer.rs b/symphonia-bundle-mp3/src/demuxer.rs index e50023a4..f706c0fb 100644 --- a/symphonia-bundle-mp3/src/demuxer.rs +++ b/symphonia-bundle-mp3/src/demuxer.rs @@ -18,7 +18,6 @@ use symphonia_core::probe::{Descriptor, Instantiate, QueryDescriptor}; use crate::common::{FrameHeader, MpegLayer}; use crate::header::{self, MAX_MPEG_FRAME_SIZE, MPEG_HEADER_LEN}; - use log::{debug, info, warn}; /// MPEG1 and MPEG2 audio elementary stream reader. diff --git a/symphonia-bundle-mp3/src/layer3/mod.rs b/symphonia-bundle-mp3/src/layer3/mod.rs index 9b19cc43..6da0fbe9 100644 --- a/symphonia-bundle-mp3/src/layer3/mod.rs +++ b/symphonia-bundle-mp3/src/layer3/mod.rs @@ -8,8 +8,8 @@ use std::fmt; use symphonia_core::audio::{AudioBuffer, Signal}; -use symphonia_core::errors::{decode_error, Result}; use symphonia_core::errors::SymphoniaError as Error; +use symphonia_core::errors::{decode_error, Result}; use symphonia_core::io::{BitReaderLtr, BufReader, ReadBitsLtr, ReadBytes}; mod bitstream; diff --git a/symphonia-codec-aac/src/aac/codebooks.rs b/symphonia-codec-aac/src/aac/codebooks.rs index b5d7b9e5..f33eeb5a 100644 --- a/symphonia-codec-aac/src/aac/codebooks.rs +++ b/symphonia-codec-aac/src/aac/codebooks.rs @@ -5,8 +5,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use symphonia_core::io::{vlc::*, ReadBitsLtr}; use symphonia_core::errors::Result; +use symphonia_core::io::{vlc::*, ReadBitsLtr}; use lazy_static::lazy_static; diff --git a/symphonia-core/src/audio.rs b/symphonia-core/src/audio.rs index b8f93a42..047cb360 100644 --- a/symphonia-core/src/audio.rs +++ b/symphonia-core/src/audio.rs @@ -11,10 +11,10 @@ use alloc::borrow::Cow; use alloc::boxed::Box; use alloc::vec; +use alloc::vec::Vec; use core::fmt; use core::marker::PhantomData; use core::mem; -use alloc::vec::Vec; use arrayvec::ArrayVec; use bitflags::bitflags; diff --git a/symphonia-core/src/dsp/fft.rs b/symphonia-core/src/dsp/fft.rs index 29e375cd..a8cbfe86 100644 --- a/symphonia-core/src/dsp/fft.rs +++ b/symphonia-core/src/dsp/fft.rs @@ -409,8 +409,8 @@ fn fft2(x: &mut [Complex; 2]) { #[cfg(test)] mod tests { - use alloc::vec::Vec; use super::*; + use alloc::vec::Vec; use core::f64; /// Compute a naive DFT. diff --git a/symphonia-core/src/dsp/mdct/simd.rs b/symphonia-core/src/dsp/mdct/simd.rs index 621b5de5..9ec4b07c 100644 --- a/symphonia-core/src/dsp/mdct/simd.rs +++ b/symphonia-core/src/dsp/mdct/simd.rs @@ -8,9 +8,9 @@ //! The Modified Discrete Cosine Transform (MDCT) implemented with SIMD optimizations. use alloc::boxed::Box; -use alloc::vec::Vec; use alloc::sync::Arc; use alloc::vec; +use alloc::vec::Vec; use rustfft::num_complex::Complex; diff --git a/symphonia-core/src/dsp/mod.rs b/symphonia-core/src/dsp/mod.rs index 82f3c9ea..243198fb 100644 --- a/symphonia-core/src/dsp/mod.rs +++ b/symphonia-core/src/dsp/mod.rs @@ -8,7 +8,7 @@ //! The `dsp` module provides efficient implementations of common signal processing algorithms. pub mod complex; -#[cfg(feature="fft")] +#[cfg(feature = "fft")] pub mod fft; -#[cfg(feature="fft")] +#[cfg(feature = "fft")] pub mod mdct; diff --git a/symphonia-core/src/errors.rs b/symphonia-core/src/errors.rs index 8e7f9988..021d857c 100644 --- a/symphonia-core/src/errors.rs +++ b/symphonia-core/src/errors.rs @@ -7,18 +7,17 @@ //! The `errors` module defines the common error type. -use core::{result}; -use core::fmt; -use core::fmt::{Display}; use alloc::boxed::Box; +use core::fmt; +use core::fmt::Display; +use core::result; #[cfg(not(feature = "std"))] use core::error::Error as StdError; +use core::ops::Deref; #[cfg(feature = "std")] use std::error::Error as StdError; -use core::ops::Deref; - /// `SeekErrorKind` is a list of generic reasons why a seek may fail. #[derive(Debug)] @@ -116,7 +115,7 @@ impl From for SymphoniaError { match err.kind() { std::io::ErrorKind::Interrupted => SymphoniaError::IoInterruptedError(Box::new(err)), std::io::ErrorKind::UnexpectedEof => SymphoniaError::EndOfFile, - _ => SymphoniaError::IoError(Box::new(err)) + _ => SymphoniaError::IoError(Box::new(err)), } } } diff --git a/symphonia-core/src/formats.rs b/symphonia-core/src/formats.rs index 0309dd59..ed6a99b5 100644 --- a/symphonia-core/src/formats.rs +++ b/symphonia-core/src/formats.rs @@ -8,14 +8,14 @@ //! The `format` module provides the traits and support structures necessary to implement media //! demuxers. -use alloc::boxed::Box; -use alloc::string::String; -use alloc::vec::Vec; use crate::codecs::CodecParameters; use crate::errors::Result; use crate::io::{BufReader, MediaSourceStream}; use crate::meta::{Metadata, Tag}; use crate::units::{Time, TimeStamp}; +use alloc::boxed::Box; +use alloc::string::String; +use alloc::vec::Vec; pub mod prelude { //! The `formats` module prelude. @@ -330,8 +330,8 @@ impl Packet { pub mod util { //! Helper utilities for implementing `FormatReader`s. - use alloc::vec::Vec; use super::Packet; + use alloc::vec::Vec; /// A `SeekPoint` is a mapping between a sample or frame number to byte offset within a media /// stream. diff --git a/symphonia-core/src/io/bit.rs b/symphonia-core/src/io/bit.rs index 31ddee05..8d274878 100644 --- a/symphonia-core/src/io/bit.rs +++ b/symphonia-core/src/io/bit.rs @@ -7,10 +7,10 @@ use core::cmp::min; +use crate::errors::Result; +use crate::errors::SymphoniaError as Error; use crate::io::ReadBytes; use crate::util::bits::*; -use crate::errors::{Result}; -use crate::errors::SymphoniaError as Error; fn end_of_bitstream_error() -> Result { Err(Error::Other("unexpected end of bitstream")) @@ -19,11 +19,11 @@ fn end_of_bitstream_error() -> Result { pub mod vlc { //! The `vlc` module provides support for decoding variable-length codes (VLC). - use core::cmp::max; + use crate::errors::Result; + use crate::errors::SymphoniaError as Error; use alloc::collections::{BTreeMap, VecDeque}; use alloc::vec::Vec; - use crate::errors::{Result}; - use crate::errors::SymphoniaError as Error; + use core::cmp::max; fn codebook_error(desc: &'static str) -> Result { Err(Error::Other(desc)) @@ -1469,10 +1469,10 @@ impl<'a> FiniteBitStream for BitReaderRtl<'a> { #[cfg(test)] mod tests { - use alloc::vec::Vec; use super::vlc::{BitOrder, Codebook, CodebookBuilder, Entry8x8}; use super::{BitReaderLtr, ReadBitsLtr}; use super::{BitReaderRtl, ReadBitsRtl}; + use alloc::vec::Vec; #[test] #[allow(clippy::bool_assert_comparison)] diff --git a/symphonia-core/src/io/buf_reader.rs b/symphonia-core/src/io/buf_reader.rs index 072912c6..233be022 100644 --- a/symphonia-core/src/io/buf_reader.rs +++ b/symphonia-core/src/io/buf_reader.rs @@ -8,7 +8,7 @@ use core::cmp; use super::{FiniteStream, ReadBytes}; -use crate::errors::{Result}; +use crate::errors::Result; use crate::errors::SymphoniaError as Error; #[inline(always)] diff --git a/symphonia-core/src/io/media_source_stream.rs b/symphonia-core/src/io/media_source_stream.rs index 0f88c41b..f380b85d 100644 --- a/symphonia-core/src/io/media_source_stream.rs +++ b/symphonia-core/src/io/media_source_stream.rs @@ -203,7 +203,7 @@ impl Read for MediaSourceStream { buf = &mut buf[count..]; self.consume(count); } - Err(SymphoniaError::IoInterruptedError(_)) => {} + Err(SymphoniaError::IoInterruptedError(_)) => {} Err(e) => return Err(e), } } @@ -325,7 +325,7 @@ impl ReadBytes for MediaSourceStream { Ok(count) => { buf = &mut buf[count..]; } - Err(SymphoniaError::IoInterruptedError(_)) => {} + Err(SymphoniaError::IoInterruptedError(_)) => {} Err(e) => return Err(e), } } @@ -478,7 +478,8 @@ impl Read for &[u8] { // for a single byte the overhead is significant. if amt == 1 { buf[0] = a[0]; - } else { + } + else { buf[..amt].copy_from_slice(a); } @@ -490,12 +491,12 @@ impl Read for &[u8] { #[cfg(feature = "std")] #[cfg(test)] mod tests { + use super::{MediaSourceStream, ReadBytes, SeekBuffered}; + use crate::io::Read; use alloc::boxed::Box; use alloc::vec; use alloc::vec::Vec; - use super::{MediaSourceStream, ReadBytes, SeekBuffered}; - use std::io::{Cursor}; - use crate::io::Read; + use std::io::Cursor; /// Generate a random vector of bytes of the specified length using a PRNG. fn generate_random_bytes(len: usize) -> Box<[u8]> { diff --git a/symphonia-core/src/io/mod.rs b/symphonia-core/src/io/mod.rs index e2f3ad51..a109ee6f 100644 --- a/symphonia-core/src/io/mod.rs +++ b/symphonia-core/src/io/mod.rs @@ -19,11 +19,11 @@ //! either the [`ReadBitsLtr`] or [`ReadBitsRtl`] traits depending on the order in which they //! consume bits. +use crate::errors::{Result, SymphoniaError}; use alloc::boxed::Box; use alloc::vec; use alloc::vec::Vec; use core::mem; -use crate::errors::{SymphoniaError, Result}; #[cfg(feature = "std")] use std::io; @@ -82,20 +82,16 @@ pub trait Read { } /// Warning: The default implementation in io::Read is much faster -fn default_slow_read_to_end( - r: &mut R, - buf: &mut Vec -) -> Result { - +fn default_slow_read_to_end(r: &mut R, buf: &mut Vec) -> Result { let mut cnt: usize = 0; let mut read_buf: [u8; 1024] = [0; 1024]; loop { - let r = r.read(&mut read_buf); + let r = r.read(&mut read_buf); let n = match r { Ok(0) => break, Ok(n) => n, - Err(SymphoniaError::IoInterruptedError(_)) => 0, // Ignored + Err(SymphoniaError::IoInterruptedError(_)) => 0, // Ignored Err(err) => return Err(err), }; @@ -107,29 +103,29 @@ fn default_slow_read_to_end( } fn default_read_vectored(read: F, bufs: &mut [IoSliceMut<'_>]) -> Result - where - F: FnOnce(&mut [u8]) -> Result, +where + F: FnOnce(&mut [u8]) -> Result, { let buf = bufs.iter_mut().find(|b| !b.is_empty()).map_or(&mut [][..], |b| &mut **b); read(buf) } #[cfg(feature = "std")] -impl Read for T { +impl Read for T { fn read(&mut self, buf: &mut [u8]) -> Result { - self.read(buf).map_err(|e| { SymphoniaError::from(e) }) + self.read(buf).map_err(|e| SymphoniaError::from(e)) } } #[cfg(feature = "std")] -impl Seek for T { +impl Seek for T { fn seek(&mut self, from: SeekFrom) -> Result { let from = match from { SeekFrom::Start(x) => io::SeekFrom::Start(x), SeekFrom::End(x) => io::SeekFrom::End(x), SeekFrom::Current(x) => io::SeekFrom::Current(x), }; - self.seek(from).map_err(|e| { SymphoniaError::from(e) }) + self.seek(from).map_err(|e| SymphoniaError::from(e)) } } @@ -139,7 +135,7 @@ impl Seek for T { /// Despite requiring the [`std::io::Seek`] trait, seeking is an optional capability that can be /// queried at runtime. // pub trait MediaSource: io::Read + io::Seek + Send + Sync { -pub trait MediaSource: Read + Seek { +pub trait MediaSource: Read + Seek { /// Returns if the source is seekable. This may be an expensive operation. fn is_seekable(&self) -> bool; @@ -616,11 +612,9 @@ mod no_std_compat { buf: &'a mut [u8], } - impl <'a> IoSliceMut<'a> { + impl<'a> IoSliceMut<'a> { pub fn new(buf: &'a mut [u8]) -> IoSliceMut<'a> { - IoSliceMut { - buf - } + IoSliceMut { buf } } } @@ -639,4 +633,4 @@ mod no_std_compat { self.buf } } -} \ No newline at end of file +} diff --git a/symphonia-core/src/io/monitor_stream.rs b/symphonia-core/src/io/monitor_stream.rs index bea9335a..3053c096 100644 --- a/symphonia-core/src/io/monitor_stream.rs +++ b/symphonia-core/src/io/monitor_stream.rs @@ -5,7 +5,6 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. - use super::ReadBytes; use crate::errors::Result; diff --git a/symphonia-core/src/io/scoped_stream.rs b/symphonia-core/src/io/scoped_stream.rs index 3819300e..6cf90eff 100644 --- a/symphonia-core/src/io/scoped_stream.rs +++ b/symphonia-core/src/io/scoped_stream.rs @@ -5,8 +5,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use core::cmp; use crate::errors::{Result, SymphoniaError}; +use core::cmp; use super::{FiniteStream, ReadBytes, SeekBuffered}; diff --git a/symphonia-core/src/lib.rs b/symphonia-core/src/lib.rs index 93075c39..8d79fc2b 100644 --- a/symphonia-core/src/lib.rs +++ b/symphonia-core/src/lib.rs @@ -12,7 +12,6 @@ #![allow(clippy::excessive_precision)] #![allow(clippy::identity_op)] #![allow(clippy::manual_range_contains)] - #![cfg_attr(not(feature = "std"), feature(error_in_core))] extern crate alloc; diff --git a/symphonia-core/src/meta.rs b/symphonia-core/src/meta.rs index f3fac2bc..4664b99e 100644 --- a/symphonia-core/src/meta.rs +++ b/symphonia-core/src/meta.rs @@ -7,15 +7,15 @@ //! The `meta` module defines basic metadata elements, and management structures. +use alloc::borrow::Cow; use alloc::boxed::Box; +use alloc::collections::VecDeque; use alloc::string::String; +use alloc::string::ToString; use alloc::vec::Vec; -use alloc::borrow::Cow; -use alloc::collections::VecDeque; use core::convert::From; use core::fmt; use core::num::NonZeroU32; -use alloc::string::ToString; use crate::errors::Result; use crate::io::MediaSourceStream; diff --git a/symphonia-core/src/probe.rs b/symphonia-core/src/probe.rs index 09dc7079..9aba21c0 100644 --- a/symphonia-core/src/probe.rs +++ b/symphonia-core/src/probe.rs @@ -8,14 +8,14 @@ //! The `probe` module provides methods and traits to support auto-detection of media formats from //! arbitrary media streams. -use alloc::boxed::Box; -use alloc::string::String; -use alloc::vec::Vec; -use alloc::borrow::ToOwned; use crate::errors::{unsupported_error, Result}; use crate::formats::{FormatOptions, FormatReader}; use crate::io::{MediaSourceStream, ReadBytes, SeekBuffered}; use crate::meta::{Metadata, MetadataLog, MetadataOptions, MetadataReader}; +use alloc::borrow::ToOwned; +use alloc::boxed::Box; +use alloc::string::String; +use alloc::vec::Vec; use log::{debug, error, info}; diff --git a/symphonia-format-isomp4/src/stream.rs b/symphonia-format-isomp4/src/stream.rs index 1ac8c415..820c0d69 100644 --- a/symphonia-format-isomp4/src/stream.rs +++ b/symphonia-format-isomp4/src/stream.rs @@ -4,8 +4,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use symphonia_core::errors::{decode_error, Result}; use symphonia_core::errors::SymphoniaError as Error; +use symphonia_core::errors::{decode_error, Result}; use crate::atoms::{stsz::SampleSize, Co64Atom, MoofAtom, MoovAtom, MvexAtom, StcoAtom, TrafAtom}; diff --git a/symphonia-format-mkv/src/demuxer.rs b/symphonia-format-mkv/src/demuxer.rs index 54555a8f..428f480c 100644 --- a/symphonia-format-mkv/src/demuxer.rs +++ b/symphonia-format-mkv/src/demuxer.rs @@ -10,10 +10,10 @@ use std::convert::TryFrom; use symphonia_core::audio::Layout; use symphonia_core::codecs::{CodecParameters, CODEC_TYPE_FLAC, CODEC_TYPE_VORBIS}; +use symphonia_core::errors::SymphoniaError as Error; use symphonia_core::errors::{ decode_error, end_of_stream_error, seek_error, unsupported_error, Result, SeekErrorKind, }; -use symphonia_core::errors::SymphoniaError as Error; use symphonia_core::formats::{ Cue, FormatOptions, FormatReader, Packet, SeekMode, SeekTo, SeekedTo, Track, }; diff --git a/symphonia-format-mkv/src/ebml.rs b/symphonia-format-mkv/src/ebml.rs index 7437c2ed..96841eb1 100644 --- a/symphonia-format-mkv/src/ebml.rs +++ b/symphonia-format-mkv/src/ebml.rs @@ -5,7 +5,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use symphonia_core::errors::{decode_error, seek_error, SymphoniaError, Result, SeekErrorKind}; +use symphonia_core::errors::{decode_error, seek_error, Result, SeekErrorKind, SymphoniaError}; use symphonia_core::io::{MediaSource, ReadBytes, SeekFrom}; use symphonia_core::util::bits::sign_extend_leq64_to_i64; @@ -469,7 +469,9 @@ impl ElementIterator { 8 => self.reader.read_be_f64()?, _ => { self.ignore_data()?; - return Err(SymphoniaError::DecodeError("mkv: invalid float length")); + return Err(SymphoniaError::DecodeError( + "mkv: invalid float length", + )); } }; ElementData::Float(value) diff --git a/symphonia-format-mkv/src/segment.rs b/symphonia-format-mkv/src/segment.rs index cdbc4ad0..1dd2c3e0 100644 --- a/symphonia-format-mkv/src/segment.rs +++ b/symphonia-format-mkv/src/segment.rs @@ -5,8 +5,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. +use symphonia_core::errors::Result; use symphonia_core::errors::SymphoniaError as Error; -use symphonia_core::errors::{Result}; use symphonia_core::io::{BufReader, ReadBytes}; use symphonia_core::meta::{MetadataBuilder, MetadataRevision, Tag, Value}; diff --git a/symphonia-format-ogg/src/demuxer.rs b/symphonia-format-ogg/src/demuxer.rs index 8eda9523..7e793a07 100644 --- a/symphonia-format-ogg/src/demuxer.rs +++ b/symphonia-format-ogg/src/demuxer.rs @@ -8,7 +8,7 @@ use std::collections::BTreeMap; use symphonia_core::errors::{reset_error, seek_error, unsupported_error}; -use symphonia_core::errors::{SymphoniaError, Result, SeekErrorKind}; +use symphonia_core::errors::{Result, SeekErrorKind, SymphoniaError}; use symphonia_core::formats::prelude::*; use symphonia_core::io::*; use symphonia_core::meta::{Metadata, MetadataLog}; diff --git a/symphonia-format-ogg/src/page.rs b/symphonia-format-ogg/src/page.rs index e824694c..a5621e16 100644 --- a/symphonia-format-ogg/src/page.rs +++ b/symphonia-format-ogg/src/page.rs @@ -6,7 +6,7 @@ // file, You can obtain one at https://mozilla.org/MPL/2.0/. use symphonia_core::checksum::Crc32; -use symphonia_core::errors::{decode_error, SymphoniaError, Result}; +use symphonia_core::errors::{decode_error, Result, SymphoniaError}; use symphonia_core::io::{BufReader, Monitor, MonitorStream, ReadBytes, SeekBuffered}; use log::{debug, warn}; diff --git a/symphonia-format-ogg/src/physical.rs b/symphonia-format-ogg/src/physical.rs index 58c80b96..19d94a13 100644 --- a/symphonia-format-ogg/src/physical.rs +++ b/symphonia-format-ogg/src/physical.rs @@ -7,7 +7,9 @@ use std::collections::{BTreeMap, BTreeSet}; use symphonia_core::errors::Result; -use symphonia_core::io::{MediaSourceStream, ReadBytes, ScopedStream, SeekBuffered, SeekFrom, Seek}; +use symphonia_core::io::{ + MediaSourceStream, ReadBytes, ScopedStream, Seek, SeekBuffered, SeekFrom, +}; use super::logical::{InspectState, LogicalStream}; use super::page::*; diff --git a/symphonia-format-riff/src/common.rs b/symphonia-format-riff/src/common.rs index 440522eb..b8d0d67f 100644 --- a/symphonia-format-riff/src/common.rs +++ b/symphonia-format-riff/src/common.rs @@ -12,8 +12,8 @@ use std::marker::PhantomData; use symphonia_core::audio::Channels; use symphonia_core::codecs::CodecParameters; use symphonia_core::codecs::CodecType; -use symphonia_core::errors::{decode_error, end_of_stream_error, Result}; use symphonia_core::errors::SymphoniaError as Error; +use symphonia_core::errors::{decode_error, end_of_stream_error, Result}; use symphonia_core::formats::prelude::*; use symphonia_core::io::{MediaSourceStream, ReadBytes}; diff --git a/symphonia-format-wav/src/chunks.rs b/symphonia-format-wav/src/chunks.rs index 2d2b8129..b556b969 100644 --- a/symphonia-format-wav/src/chunks.rs +++ b/symphonia-format-wav/src/chunks.rs @@ -5,8 +5,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -use alloc::vec; use alloc::string::String; +use alloc::vec; use std::fmt; use std::marker::PhantomData; @@ -17,8 +17,8 @@ use symphonia_core::codecs::{ CODEC_TYPE_PCM_F64LE, CODEC_TYPE_PCM_MULAW, CODEC_TYPE_PCM_S16LE, CODEC_TYPE_PCM_S24LE, CODEC_TYPE_PCM_S32LE, CODEC_TYPE_PCM_U8, }; -use symphonia_core::errors::{decode_error, unsupported_error, Result}; use symphonia_core::errors::SymphoniaError as Error; +use symphonia_core::errors::{decode_error, unsupported_error, Result}; use symphonia_core::io::ReadBytes; use symphonia_core::meta::Tag; use symphonia_metadata::riff; diff --git a/symphonia-format-wav/src/lib.rs b/symphonia-format-wav/src/lib.rs index 52b11cd0..059fa7f0 100644 --- a/symphonia-format-wav/src/lib.rs +++ b/symphonia-format-wav/src/lib.rs @@ -15,15 +15,15 @@ #![allow(clippy::identity_op)] #![allow(clippy::manual_range_contains)] -#[cfg(not(feature="std"))] +#[cfg(not(feature = "std"))] extern crate core as std; extern crate alloc; -use alloc::vec; -use alloc::vec::Vec; use alloc::boxed::Box; use alloc::string::String; +use alloc::vec; +use alloc::vec::Vec; use symphonia_core::codecs::CodecParameters; use symphonia_core::errors::{decode_error, end_of_stream_error, seek_error, unsupported_error}; diff --git a/symphonia-metadata/src/id3v2/frames.rs b/symphonia-metadata/src/id3v2/frames.rs index a54261d2..f8bc6b8d 100644 --- a/symphonia-metadata/src/id3v2/frames.rs +++ b/symphonia-metadata/src/id3v2/frames.rs @@ -5,11 +5,11 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. use alloc::borrow::Cow; -use alloc::{format, vec}; use alloc::boxed::Box; use alloc::collections::BTreeMap; use alloc::string::{String, ToString}; use alloc::vec::Vec; +use alloc::{format, vec}; use core::str; use symphonia_core::errors::{decode_error, unsupported_error, Result}; diff --git a/symphonia-metadata/src/itunes.rs b/symphonia-metadata/src/itunes.rs index 793c2fc1..5f716514 100644 --- a/symphonia-metadata/src/itunes.rs +++ b/symphonia-metadata/src/itunes.rs @@ -10,7 +10,6 @@ use alloc::collections::BTreeMap; use symphonia_core::meta::StandardTagKey; - use lazy_static::lazy_static; lazy_static! { diff --git a/symphonia-metadata/src/lib.rs b/symphonia-metadata/src/lib.rs index 364931a7..134cf546 100644 --- a/symphonia-metadata/src/lib.rs +++ b/symphonia-metadata/src/lib.rs @@ -6,7 +6,6 @@ // file, You can obtain one at https://mozilla.org/MPL/2.0/. #![no_std] - #![warn(rust_2018_idioms)] #![forbid(unsafe_code)] // The following lints are allowed in all Symphonia crates. Please see clippy.toml for their diff --git a/symphonia-utils-xiph/src/flac/metadata.rs b/symphonia-utils-xiph/src/flac/metadata.rs index 2c11d713..00e23b0a 100644 --- a/symphonia-utils-xiph/src/flac/metadata.rs +++ b/symphonia-utils-xiph/src/flac/metadata.rs @@ -16,7 +16,9 @@ use symphonia_core::errors::{decode_error, Result}; use symphonia_core::formats::util::SeekIndex; use symphonia_core::formats::{Cue, CuePoint}; use symphonia_core::io::*; -use symphonia_core::meta::{ColorMode, MetadataBuilder, Size, StandardTagKey, StandardVisualKey, Tag, Value}; +use symphonia_core::meta::{ + ColorMode, MetadataBuilder, Size, StandardTagKey, StandardVisualKey, Tag, Value, +}; use symphonia_core::meta::{VendorData, Visual}; use symphonia_metadata::vorbis; @@ -491,7 +493,6 @@ pub fn read_picture_block( Ok(()) } - /// Try to get a `StandardVisualKey` from the APIC picture type identifier. pub fn apic_picture_type_to_visual_key(apic: u32) -> Option { match apic { @@ -518,7 +519,6 @@ pub fn apic_picture_type_to_visual_key(apic: u32) -> Option { } } - pub struct MetadataBlockHeader { pub is_last: bool, pub block_type: MetadataBlockType, diff --git a/symphonia-utils-xiph/src/lib.rs b/symphonia-utils-xiph/src/lib.rs index fd0b54bc..01606989 100644 --- a/symphonia-utils-xiph/src/lib.rs +++ b/symphonia-utils-xiph/src/lib.rs @@ -11,7 +11,6 @@ #![allow(clippy::excessive_precision)] #![allow(clippy::identity_op)] #![allow(clippy::manual_range_contains)] - #![no_std] extern crate alloc; diff --git a/symphonia/src/lib.rs b/symphonia/src/lib.rs index 2229f0d9..45f3b744 100644 --- a/symphonia/src/lib.rs +++ b/symphonia/src/lib.rs @@ -261,7 +261,6 @@ pub mod default { /// /// Use this function to easily populate a custom probe with all enabled formats. pub fn register_enabled_formats(probe: &mut Probe) { - // Formats #[cfg(feature = "aac")] probe.register_all::();