Merge pull request #15 from glandium/bitflags

Make the use of bitflags future-proof
mozilla · Sep 13, 2023 · 0646227 · 0646227
2 parents 39c24fc + 95f0a91
commit 0646227
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 travis-ci = { repository = "mozilla/audio-mixer" }
 
 [dependencies]
-bitflags = "1.2"
+bitflags = "1.3"
 
 [dev-dependencies]
 criterion = "0.3"

diff --git a/src/channel.rs b/src/channel.rs
@@ -64,18 +64,11 @@ bitflags! {
 // Avoid printing the following types in debugging context {:?} by declaring them in impl
 // rather than bitflags! {} scope.
 impl ChannelMap {
-    pub const FRONT_2: Self = Self {
-        bits: Self::FRONT_LEFT.bits() | Self::FRONT_RIGHT.bits(),
-    };
-    pub const BACK_2: Self = Self {
-        bits: Self::BACK_LEFT.bits() | Self::BACK_RIGHT.bits(),
-    };
-    pub const FRONT_2_OF_CENTER: Self = Self {
-        bits: Self::FRONT_LEFT_OF_CENTER.bits() | Self::FRONT_RIGHT_OF_CENTER.bits(),
-    };
-    pub const SIDE_2: Self = Self {
-        bits: Self::SIDE_LEFT.bits() | Self::SIDE_RIGHT.bits(),
-    };
+    pub const FRONT_2: Self = Self::union(Self::FRONT_LEFT, Self::FRONT_RIGHT);
+    pub const BACK_2: Self = Self::union(Self::BACK_LEFT, Self::BACK_RIGHT);
+    pub const FRONT_2_OF_CENTER: Self =
+        Self::union(Self::FRONT_LEFT_OF_CENTER, Self::FRONT_RIGHT_OF_CENTER);
+    pub const SIDE_2: Self = Self::union(Self::SIDE_LEFT, Self::SIDE_RIGHT);
 }
 
 impl From<Channel> for ChannelMap {