release: 0.11.0

Author: joshstoik1

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 
 
+## [0.11.0](https://github.com/Blobfolio/cdtoc/releases/tag/v0.11.0) - 2025-06-26
+
+### Changed
+
+* Bump `brunch` to `0.11` (dev)
+* Bump `dactyl` to `0.13`
+* Bump `trimothy` to `0.9`
+* Bump MSRV to `1.88`
+* Impl `FusedIterator` for `Tracks`
+* Miscellaneous code cleanup and lints
+
+
+
 ## [0.10.0](https://github.com/Blobfolio/cdtoc/releases/tag/v0.10.0) - 2025-06-01
 
 ### Changed

CREDITS.md

@@ -1,25 +1,25 @@
 # Project Dependencies
     Package:   cdtoc
-    Version:   0.10.0
-    Generated: 2025-06-02 04:54:55 UTC
+    Version:   0.11.0
+    Generated: 2025-06-26 20:18:46 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.12.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.13.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 | [**faster-hex**](https://github.com/NervosFoundation/faster-hex) | 0.10.0 | [zhangsoledad](mailto:787953403@qq.com) | MIT |
-| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.8.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.9.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 | [_block-buffer_](https://github.com/RustCrypto/utils) | 0.10.4 | RustCrypto Developers | MIT OR Apache-2.0 |
 | [_byteorder_](https://github.com/BurntSushi/byteorder) | 1.5.0 | [Andrew Gallant](mailto:jamslam@gmail.com) | Unlicense OR MIT |
-| [_cc_](https://github.com/rust-lang/cc-rs) ⚒️ | 1.2.25 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
-| [_cfg-if_](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
+| [_cc_](https://github.com/rust-lang/cc-rs) ⚒️ | 1.2.27 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
+| [_cfg-if_](https://github.com/rust-lang/cfg-if) | 1.0.1 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
 | [_cpufeatures_](https://github.com/RustCrypto/utils) | 0.2.17 | RustCrypto Developers | MIT OR Apache-2.0 |
 | [_crypto-common_](https://github.com/RustCrypto/traits) | 0.1.6 | RustCrypto Developers | MIT OR Apache-2.0 |
 | [_digest_](https://github.com/RustCrypto/traits) | 0.10.7 | RustCrypto Developers | MIT OR Apache-2.0 |
 | [_generic-array_](https://github.com/fizyk20/generic-array.git) | 0.14.7 | [Bartłomiej Kamiński](mailto:fizyk20@gmail.com) and [Aaron Trent](mailto:novacrazy@gmail.com) | MIT |
 | [_hash32_](https://github.com/japaric/hash32) | 0.3.1 | [Jorge Aparicio](mailto:jorge@japaric.io) | MIT OR Apache-2.0 |
 | [_heapless_](https://github.com/rust-embedded/heapless) | 0.8.0 | [Jorge Aparicio](mailto:jorge@japaric.io), [Per Lindgren](mailto:per.lindgren@ltu.se), and [Emil Fresk](mailto:emil.fresk@gmail.com) | MIT OR Apache-2.0 |
 | [**_itoa_**](https://github.com/dtolnay/itoa) | 1.0.15 | [David Tolnay](mailto:dtolnay@gmail.com) | MIT OR Apache-2.0 |
-| [_libc_](https://github.com/rust-lang/libc) | 0.2.172 | The Rust Project Developers | MIT OR Apache-2.0 |
+| [_libc_](https://github.com/rust-lang/libc) | 0.2.174 | The Rust Project Developers | MIT OR Apache-2.0 |
 | [_proc-macro2_](https://github.com/dtolnay/proc-macro2) ⚒️ | 1.0.95 | [David Tolnay](mailto:dtolnay@gmail.com) and [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
 | [_quote_](https://github.com/dtolnay/quote) ⚒️ | 1.0.40 | [David Tolnay](mailto:dtolnay@gmail.com) | MIT OR Apache-2.0 |
 | [**_serde_**](https://github.com/serde-rs/serde) | 1.0.219 | [Erick Tryzelaar](mailto:erick.tryzelaar@gmail.com) and [David Tolnay](mailto:dtolnay@gmail.com) | MIT OR Apache-2.0 |
@@ -28,7 +28,7 @@
 | [_sha1-asm_](https://github.com/RustCrypto/asm-hashes) | 0.5.3 | RustCrypto Developers | MIT |
 | [_shlex_](https://github.com/comex/rust-shlex) ⚒️ | 1.3.0 | [comex](mailto:comexk@gmail.com), [Fenhl](mailto:fenhl@fenhl.net), [Adrian Taylor](mailto:adetaylor@chromium.org), [Alex Touchet](mailto:alextouchet@outlook.com), [Daniel Parks](mailto:dp+git@oxidized.org), and [Garrett Berg](mailto:googberg@gmail.com) | MIT OR Apache-2.0 |
 | [_stable_deref_trait_](https://github.com/storyyeller/stable_deref_trait) | 1.2.0 | [Robert Grosse](mailto:n210241048576@gmail.com) | MIT OR Apache-2.0 |
-| [_syn_](https://github.com/dtolnay/syn) ⚒️ | 2.0.101 | [David Tolnay](mailto:dtolnay@gmail.com) | MIT OR Apache-2.0 |
+| [_syn_](https://github.com/dtolnay/syn) ⚒️ | 2.0.104 | [David Tolnay](mailto:dtolnay@gmail.com) | MIT OR Apache-2.0 |
 | [_typenum_](https://github.com/paholg/typenum) | 1.18.0 | [Paho Lurie-Gregg](mailto:paho@paholg.com) and [Andre Bogus](mailto:bogusandre@gmail.com) | MIT OR Apache-2.0 |
 | [_unicode-ident_](https://github.com/dtolnay/unicode-ident) ⚒️ | 1.0.18 | [David Tolnay](mailto:dtolnay@gmail.com) | (MIT OR Apache-2.0) AND Unicode-3.0 |
 | [_version_check_](https://github.com/SergioBenitez/version_check) ⚒️ | 0.9.5 | [Sergio Benitez](mailto:sb@sergio.bz) | MIT OR Apache-2.0 |

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "cdtoc"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.88"
 description = "Parser and tools for CDTOC metadata tags."
 license = "WTFPL"
 repository = "https://github.com/Blobfolio/cdtoc"
@@ -27,12 +27,12 @@ features = [ "accuraterip", "cddb", "ctdb", "musicbrainz", "serde" ]
 default-target = "x86_64-unknown-linux-gnu"
 
 [dev-dependencies]
-brunch = "0.10.*"
+brunch = "0.11.*"
 serde_json = "1.0.*"
 
 [dependencies]
-dactyl = "0.12.*"
-trimothy = "0.8.*"
+dactyl = "0.13.*"
+trimothy = "0.9.*"
 
 [dependencies.faster-hex]
 version = "0.10.*"

README.md

@@ -62,13 +62,13 @@ Add `cdtoc` to your `dependencies` in `Cargo.toml`, like:
 
 ```toml
 [dependencies]
-cdtoc = "0.10.*"
+cdtoc = "0.11.*"
 ```
 
 The disc ID helpers require additional dependencies, so if you aren't using them, be sure to disable the default features (adding back any you _do_ want) to skip the overhead.
 
 ```toml
 [dependencies.cdtoc]
-version = "0.10.*"
+version = "0.11.*"
 default-features = false
 ```

src/ctdb.rs

@@ -49,12 +49,11 @@ impl Toc {
 
 		// Split the leadin from the rest of the sectors.
 		let [leadin, sectors @ ..] = self.audio_sectors() else { unreachable!() };
-		let len = sectors.len();
-		let rem = len % CHUNK_SIZE;
 
 		// Process the sector positions in batches of four to leverage SSE hex
 		// optimizations.
-		for v in sectors.chunks_exact(CHUNK_SIZE) {
+		let (chunks, rest) = sectors.as_chunks::<CHUNK_SIZE>();
+		for v in chunks {
 			// Copy the values to the source buffer.
 			for (s_chunk, v) in src.chunks_exact_mut(4).zip(v.iter().map(|n| n - leadin)) {
 				s_chunk.copy_from_slice(v.to_be_bytes().as_slice());
@@ -67,7 +66,7 @@ impl Toc {
 		}
 
 		// Handle the remaining sectors, if any, and the leadout.
-		if rem == 0 {
+		if rest.is_empty() {
 			let dst2 = &mut dst[..8];
 			faster_hex::hex_encode_fallback((self.audio_leadout() - leadin).to_be_bytes().as_slice(), dst2);
 			dst2.make_ascii_uppercase();
@@ -76,22 +75,22 @@ impl Toc {
 		else {
 			// Copy the values to the source buffer.
 			for (s_chunk, v) in src.chunks_exact_mut(4).zip(
-				sectors[len - rem..].iter().map(|n| n - leadin)
+				rest.iter().map(|n| n - leadin)
 					.chain(std::iter::once(self.audio_leadout() - leadin))
 			) {
 				s_chunk.copy_from_slice(v.to_be_bytes().as_slice());
 			}
 
 			// Encode and hash, en masse.
-			let src_to = rem * 4 + 4;
+			let src_to = rest.len() * 4 + 4;
 			let dst2 = &mut dst[..src_to * 2];
 			faster_hex::hex_encode(&src[..src_to], dst2).unwrap();
 			dst2.make_ascii_uppercase();
 			sha.update(dst2);
 		}
 
 		// And padding for a total of 99 tracks.
-		let padding = 99 - len;
+		let padding = 99 - sectors.len();
 		if padding != 0 { sha.update(&crate::ZEROES[..padding * 8]); }
 
 		// Run it through base64 and we're done!

src/musicbrainz.rs

@@ -58,9 +58,8 @@ impl Toc {
 		// Process the sector positions in batches of four to leverage SSE hex
 		// optimizations.
 		let sectors = self.audio_sectors();
-		let len = sectors.len();
-		let rem = len % CHUNK_SIZE;
-		for v in sectors.chunks_exact(CHUNK_SIZE) {
+		let (chunks, rest) = sectors.as_chunks::<CHUNK_SIZE>();
+		for v in chunks {
 			// Copy the values to the source buffer.
 			for (s_chunk, v) in src.chunks_exact_mut(4).zip(v) {
 				s_chunk.copy_from_slice(v.to_be_bytes().as_slice());
@@ -73,14 +72,14 @@ impl Toc {
 		}
 
 		// Handle the remaining sectors, if any,
-		if rem != 0 {
+		if ! rest.is_empty() {
 			// Copy the values to the source buffer.
-			for (s_chunk, v) in src.chunks_exact_mut(4).zip(sectors[len - rem..].iter()) {
+			for (s_chunk, v) in src.chunks_exact_mut(4).zip(rest.iter()) {
 				s_chunk.copy_from_slice(v.to_be_bytes().as_slice());
 			}
 
 			// Encode and hash, en masse.
-			let src_to = rem * 4;
+			let src_to = rest.len() * 4;
 			let dst2 = &mut dst[..src_to * 2];
 			faster_hex::hex_encode_fallback(&src[..src_to], dst2);
 			dst2.make_ascii_uppercase();

src/time.rs

@@ -5,10 +5,8 @@
 use crate::TocError;
 use dactyl::{
 	NiceElapsed,
-	traits::{
-		IntDivFloat,
-		NiceInflection,
-	},
+	NiceFloat,
+	traits::NiceInflection,
 };
 use std::{
 	fmt,
@@ -260,7 +258,7 @@ impl Duration {
 			let (s, rem) = (total_samples.wrapping_div(sample_rate), total_samples % sample_rate);
 			if rem == 0 { Self(s * SECTORS_PER_SECOND) }
 			else {
-				let f = (rem * 75).div_float(sample_rate)
+				let f = NiceFloat::div_u64(rem * 75, sample_rate)
 					.map_or(0, |f| f.trunc() as u64);
 				Self(s * SECTORS_PER_SECOND + f)
 			}

src/track.rs

@@ -297,6 +297,8 @@ impl ExactSizeIterator for Tracks<'_> {
 	fn len(&self) -> usize { self.tracks.len().saturating_sub(self.pos) }
 }
 
+impl std::iter::FusedIterator for Tracks<'_> {}
+
 impl<'a> Tracks<'a> {
 	/// # New.
 	pub(super) const fn new(tracks: &'a [u32], leadout: u32) -> Self {