pdeljanov · caass · Jan 2, 2025 · Jan 2, 2025 · Jan 2, 2025 · Jan 2, 2025
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,3 +22,32 @@ members = [
     "symphonia-play",
     "symphonia-check",
 ]
+
+[workspace.lints.rust]
+rust_2018_idioms = { level = "warn", priority = -1 }
+unsafe_code = "forbid"
+deprecated-safe = "forbid"
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+
+[workspace.lints.clippy]
+# Justification:
+#   Where possible, expressing an algorithm as closely as possible to the specification is
+#   preferrable. Rewriting using range syntax provides marginal benefit, but could be confusing.
+manual_range_contains = "allow"
+
+# Justification:
+#   There is a performance penalty associated with the recommended idiom.
+comparison_chain = "allow"
+
+# Justification:
+#   Floating point constants provided by specifications and papers often provide extra digits that
+#   are truncated when using 32-bit floating point airthmetic. By keeping this precision, we can use
+#   the values provided directly & without modification, and, when investigating accuracy issues,
+#   we can easily switch to 64-bit floating point arithmetic and benefit from the higher precision.
+excessive_precision = "allow"
+
+# Justification:
+#   Sometimes the base or initial case of an unrolled multi-iteration/step mathematical expression
+#   contains operations that are otherwise no-ops. Disable the warning for these expressions because
+#   they're instructive to the reader and improve the code aesthetics.
+identity_op = "allow"
diff --git a/clippy.toml b/clippy.toml
@@ -1,42 +1 @@
-# The following lints are ALLOWED in all Symphonia crates.
-#
-# --------------------------------------------------------------------------------------------------
-#
-# Lint:
-#   clippy::manual_range_contains
-#
-# Justification:
-#   Where possible, expressing an algorithm as closely as possible to the specification is
-#   preferrable. Rewriting using range syntax provides marginal benefit, but could be confusing.
-#
-# --------------------------------------------------------------------------------------------------
-#
-# Lint:
-#   clippy::comparison_chain
-#
-# Justification:
-#   There is a performance penalty associated with the recommended idiom.
-#
-# --------------------------------------------------------------------------------------------------
-#
-# Lint:
-#   clippy::excessive_precision
-#
-# Justification:
-#   Floating point constants provided by specifications and papers often provide extra digits that
-#   are truncated when using 32-bit floating point airthmetic. By keeping this precision, we can use
-#   the values provided directly & without modification, and, when investigating accuracy issues,
-#   we can easily switch to 64-bit floating point arithmetic and benefit from the higher precision.
-#
-# --------------------------------------------------------------------------------------------------
-#
-# Lint:
-#   clippy::identity_op
-#
-# Justification:
-#   Sometimes the base or initial case of an unrolled multi-iteration/step mathematical expression
-#   contains operations that are otherwise no-ops. Disable the warning for these expressions because
-#   they're instructive to the reader and improve the code aesthetics.
-#
-# --------------------------------------------------------------------------------------------------
-msrv = "1.77"
+msrv = "1.77"
diff --git a/symphonia-bundle-flac/Cargo.toml b/symphonia-bundle-flac/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "flac"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
@@ -22,6 +25,3 @@ version = "0.5.4"
 path = "../symphonia-metadata"
 default-features = false
 features = ["flac"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
diff --git a/symphonia-bundle-flac/src/lib.rs b/symphonia-bundle-flac/src/lib.rs
@@ -5,15 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
-
 mod decoder;
 mod demuxer;
 mod frame;

diff --git a/symphonia-bundle-mp3/Cargo.toml b/symphonia-bundle-mp3/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "mp3", "mpeg"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [features]
 default = ["mp1", "mp2", "mp3"]
 mp1 = []

diff --git a/symphonia-bundle-mp3/src/lib.rs b/symphonia-bundle-mp3/src/lib.rs
@@ -5,15 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
-
 // Shared modules.
 mod common;
 mod header;

diff --git a/symphonia-check/Cargo.toml b/symphonia-check/Cargo.toml
@@ -10,6 +10,9 @@ edition = "2021"
 rust-version = "1.77"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 clap = "3.1.0"
 log = { version = "0.4", features = ["release_max_level_info"] }

diff --git a/symphonia-check/src/main.rs b/symphonia-check/src/main.rs
@@ -5,8 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
 // Justification: Fields on DecoderOptions and FormatOptions may change at any time, but
 // symphonia-check doesn't want to be updated every time those fields change, therefore always fill
 // in the remaining fields with default values.

diff --git a/symphonia-codec-aac/Cargo.toml b/symphonia-codec-aac/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "aac", "m4a"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 lazy_static = "1.4.0"

diff --git a/symphonia-codec-aac/src/lib.rs b/symphonia-codec-aac/src/lib.rs
@@ -5,14 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
 // TODO: Remove this when refactoring AAC.
 #![allow(clippy::needless_range_loop)]
 

diff --git a/symphonia-codec-adpcm/Cargo.toml b/symphonia-codec-adpcm/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "adpcm"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
diff --git a/symphonia-codec-adpcm/src/lib.rs b/symphonia-codec-adpcm/src/lib.rs
@@ -5,15 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
-
 use symphonia_core::codecs::registry::{RegisterableAudioDecoder, SupportedAudioCodec};
 use symphonia_core::codecs::CodecInfo;
 use symphonia_core::support_audio_codec;

diff --git a/symphonia-codec-alac/Cargo.toml b/symphonia-codec-alac/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "alac"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
-symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
+symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
diff --git a/symphonia-codec-alac/src/lib.rs b/symphonia-codec-alac/src/lib.rs
@@ -5,14 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
 // Disable to better express the specification.
 #![allow(clippy::collapsible_else_if)]
 

diff --git a/symphonia-codec-opus/Cargo.toml b/symphonia-codec-opus/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "opus"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
diff --git a/symphonia-codec-pcm/Cargo.toml b/symphonia-codec-pcm/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "pcm"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
-symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
+symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
diff --git a/symphonia-codec-pcm/src/lib.rs b/symphonia-codec-pcm/src/lib.rs
@@ -5,15 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
-
 use symphonia_core::codecs::registry::{RegisterableAudioDecoder, SupportedAudioCodec};
 use symphonia_core::codecs::CodecInfo;
 use symphonia_core::support_audio_codec;

diff --git a/symphonia-codec-vorbis/Cargo.toml b/symphonia-codec-vorbis/Cargo.toml
@@ -12,7 +12,10 @@ keywords = ["audio", "codec", "decoder", "vorbis"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
-symphonia-common = { version = "0.5.4", path = "../symphonia-common" }
+symphonia-common = { version = "0.5.4", path = "../symphonia-common" }
diff --git a/symphonia-codec-vorbis/src/lib.rs b/symphonia-codec-vorbis/src/lib.rs
@@ -5,14 +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/.
 
-#![warn(rust_2018_idioms)]
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
 // Disable to better express the specification.
 #![allow(clippy::collapsible_else_if)]
 

diff --git a/symphonia-codec-wavpack/Cargo.toml b/symphonia-codec-wavpack/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "wavpack"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
-symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
+symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
diff --git a/symphonia-common/Cargo.toml b/symphonia-common/Cargo.toml
@@ -12,11 +12,14 @@ keywords = ["audio", "multimedia", "media", "xiph"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }
 
 [dependencies.symphonia-metadata]
 version = "0.5.4"
 path = "../symphonia-metadata"
 default-features = false
-features = ["flac"]
+features = ["flac"]
diff --git a/symphonia-common/src/lib.rs b/symphonia-common/src/lib.rs
@@ -5,12 +5,5 @@
 // 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/.
 
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
-
 pub mod mpeg;
 pub mod xiph;
diff --git a/symphonia-core/Cargo.toml b/symphonia-core/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "codec", "decoder", "multimedia", "media"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [features]
 default = []
 
@@ -21,11 +24,7 @@ opt-simd-avx = ["rustfft/avx"]
 opt-simd-neon = ["rustfft/neon"]
 
 # Enable all SIMD support.
-opt-simd = [
-    "opt-simd-sse",
-    "opt-simd-avx",
-    "opt-simd-neon",
-]
+opt-simd = ["opt-simd-sse", "opt-simd-avx", "opt-simd-neon"]
 
 [dependencies]
 bitflags = "2.4.2"
@@ -38,4 +37,4 @@ smallvec = "1.13.1"
 [dependencies.rustfft]
 version = "6.1.0"
 optional = true
-default-features = false
+default-features = false
diff --git a/symphonia-core/src/lib.rs b/symphonia-core/src/lib.rs
@@ -4,13 +4,6 @@
 // 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/.
-#![forbid(unsafe_code)]
-// The following lints are allowed in all Symphonia crates. Please see clippy.toml for their
-// justification.
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::excessive_precision)]
-#![allow(clippy::identity_op)]
-#![allow(clippy::manual_range_contains)]
 
 pub mod audio;
 pub mod checksum;

diff --git a/symphonia-format-caf/Cargo.toml b/symphonia-format-caf/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["audio", "media", "demuxer", "caf"]
 edition = "2021"
 rust-version = "1.77"
 
+[lints]
+workspace = true
+
 [dependencies]
 log = "0.4"
 symphonia-core = { version = "0.5.4", path = "../symphonia-core" }