chore: Migrate to Rust 2024 edition (MSRV 1.85).

Author: pdeljanov

Cargo.toml

@@ -24,10 +24,10 @@ members = [
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/pdeljanov/Symphonia"
 license = "MPL-2.0"
 license-file = "LICENSE"
 repository = "https://github.com/pdeljanov/Symphonia"
-rust-version = "1.77"
+rust-version = "1.85"
 version = "0.6.0"

clippy.toml

@@ -39,4 +39,4 @@
 #   they're instructive to the reader and improve the code aesthetics.
 #
 # --------------------------------------------------------------------------------------------------
-msrv = "1.77"
+msrv = "1.85"

symphonia-bundle-flac/src/decoder.rs

@@ -13,12 +13,12 @@ use symphonia_common::xiph::audio::flac::StreamInfo;
 use symphonia_core::audio::{
     AsGenericAudioBufferRef, AudioBuffer, AudioMut, AudioSpec, GenericAudioBufferRef,
 };
+use symphonia_core::codecs::CodecInfo;
 use symphonia_core::codecs::audio::well_known::CODEC_ID_FLAC;
 use symphonia_core::codecs::audio::{AudioCodecParameters, AudioDecoderOptions};
 use symphonia_core::codecs::audio::{AudioDecoder, FinalizeResult, VerificationCheck};
 use symphonia_core::codecs::registry::{RegisterableAudioDecoder, SupportedAudioCodec};
-use symphonia_core::codecs::CodecInfo;
-use symphonia_core::errors::{decode_error, unsupported_error, Error, Result};
+use symphonia_core::errors::{Error, Result, decode_error, unsupported_error};
 use symphonia_core::formats::Packet;
 use symphonia_core::io::{BitReaderLtr, BufReader, ReadBitsLtr};
 use symphonia_core::support_audio_codec;

symphonia-bundle-flac/src/demuxer.rs

@@ -10,12 +10,12 @@ use std::io::{Seek, SeekFrom};
 use symphonia_core::support_format;
 
 use symphonia_common::xiph::audio::flac::{MetadataBlockHeader, MetadataBlockType, StreamInfo};
+use symphonia_core::codecs::CodecParameters;
 use symphonia_core::codecs::audio::{
-    well_known::CODEC_ID_FLAC, AudioCodecParameters, VerificationCheck,
+    AudioCodecParameters, VerificationCheck, well_known::CODEC_ID_FLAC,
 };
-use symphonia_core::codecs::CodecParameters;
 use symphonia_core::errors::{
-    decode_error, seek_error, unsupported_error, Error, Result, SeekErrorKind,
+    Error, Result, SeekErrorKind, decode_error, seek_error, unsupported_error,
 };
 use symphonia_core::formats::prelude::*;
 use symphonia_core::formats::probe::{ProbeFormatData, ProbeableFormat, Score, Scoreable};

symphonia-bundle-flac/src/frame.rs

@@ -6,7 +6,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use symphonia_core::checksum::Crc8Ccitt;
-use symphonia_core::errors::{decode_error, Result};
+use symphonia_core::errors::{Result, decode_error};
 use symphonia_core::io::{Monitor, MonitorStream, ReadBytes};
 
 /// The minimum FLAC frame header size including the sync bytes.

symphonia-bundle-mp3/src/common.rs

@@ -5,9 +5,9 @@
 // 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::audio::{layouts, AudioBuffer, AudioSpec, Channels, Position};
-use symphonia_core::codecs::audio::well_known::{CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3};
+use symphonia_core::audio::{AudioBuffer, AudioSpec, Channels, Position, layouts};
 use symphonia_core::codecs::audio::AudioCodecId;
+use symphonia_core::codecs::audio::well_known::{CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3};
 use symphonia_core::errors::Result;
 
 use symphonia_core::io::BufReader;

symphonia-bundle-mp3/src/decoder.rs

@@ -6,12 +6,12 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use symphonia_core::audio::{AsGenericAudioBufferRef, Audio, AudioBuffer, GenericAudioBufferRef};
+use symphonia_core::codecs::CodecInfo;
 use symphonia_core::codecs::audio::{
     AudioCodecId, AudioCodecParameters, AudioDecoder, AudioDecoderOptions, FinalizeResult,
 };
 use symphonia_core::codecs::registry::{RegisterableAudioDecoder, SupportedAudioCodec};
-use symphonia_core::codecs::CodecInfo;
-use symphonia_core::errors::{decode_error, unsupported_error, Result};
+use symphonia_core::errors::{Result, decode_error, unsupported_error};
 use symphonia_core::formats::Packet;
 use symphonia_core::io::FiniteStream;
 use symphonia_core::support_audio_codec;

symphonia-bundle-mp3/src/demuxer.rs

@@ -8,10 +8,10 @@
 use symphonia_core::support_format;
 
 use symphonia_core::checksum::Crc16AnsiLe;
-use symphonia_core::codecs::audio::well_known::{CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3};
-use symphonia_core::codecs::audio::AudioCodecParameters;
 use symphonia_core::codecs::CodecParameters;
-use symphonia_core::errors::{seek_error, Error, Result, SeekErrorKind};
+use symphonia_core::codecs::audio::AudioCodecParameters;
+use symphonia_core::codecs::audio::well_known::{CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3};
+use symphonia_core::errors::{Error, Result, SeekErrorKind, seek_error};
 use symphonia_core::formats::prelude::*;
 use symphonia_core::formats::probe::{ProbeFormatData, ProbeableFormat, Score, Scoreable};
 use symphonia_core::formats::well_known::{FORMAT_ID_MP1, FORMAT_ID_MP2, FORMAT_ID_MP3};
@@ -857,7 +857,7 @@ fn try_read_info_tag_inner(buf: &[u8], header: &FrameHeader) -> Result<Option<Xi
         };
 
         // If there is no CRC, then assume the tag is correct. Otherwise, use the CRC.
-        let is_tag_ok = crc.map_or(true, |crc| crc == reader.monitor().crc());
+        let is_tag_ok = crc.is_none_or(|crc| crc == reader.monitor().crc());
 
         if is_tag_ok {
             // The CRC matched or is not present.

symphonia-bundle-mp3/src/header.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, unsupported_error, Result};
+use symphonia_core::errors::{Result, decode_error, unsupported_error};
 use symphonia_core::io::ReadBytes;
 
 use crate::common::*;

symphonia-bundle-mp3/src/layer1/mod.rs

@@ -6,7 +6,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use symphonia_core::audio::{AudioBuffer, AudioMut};
-use symphonia_core::errors::{decode_error, Result};
+use symphonia_core::errors::{Result, decode_error};
 use symphonia_core::io::{BitReaderLtr, BufReader, ReadBitsLtr, ReadBytes};
 use symphonia_core::util::bits::sign_extend_leq32_to_i32;
 
@@ -70,6 +70,7 @@ impl Layer1 {
 }
 
 impl Layer for Layer1 {
+    #[allow(clippy::needless_range_loop)]
     fn decode(
         &mut self,
         reader: &mut BufReader<'_>,
@@ -111,6 +112,7 @@ impl Layer for Layer1 {
         }
 
         // Read bit allocations for the intensity coded sub-bands.
+        // NOTE: This loop causes a false positive with clippy.
         for sb in bound..32 {
             let bits = bs.read_bits_leq32(4)? as u8;