Removed count_ones in favor of is_power_of_two

rafalh · May 2, 2024 · ef362a1 · ef362a1
1 parent fba8854
commit ef362a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/boot_sector.rs b/src/boot_sector.rs
@@ -125,7 +125,7 @@ impl BiosParameterBlock {
     }
 
     fn validate_bytes_per_sector<E: IoError>(&self) -> Result<(), Error<E>> {
-        if self.bytes_per_sector.count_ones() != 1 {
+        if !self.bytes_per_sector.is_power_of_two() {
             error!(
                 "invalid bytes_per_sector value in BPB: expected a power of two but got {}",
                 self.bytes_per_sector
@@ -143,7 +143,7 @@ impl BiosParameterBlock {
     }
 
     fn validate_sectors_per_cluster<E: IoError>(&self) -> Result<(), Error<E>> {
-        if self.sectors_per_cluster.count_ones() != 1 {
+        if !self.sectors_per_cluster.is_power_of_two() {
             error!(
                 "invalid sectors_per_cluster value in BPB: expected a power of two but got {}",
                 self.sectors_per_cluster

diff --git a/src/fs.rs b/src/fs.rs
@@ -981,7 +981,7 @@ impl FormatVolumeOptions {
     #[must_use]
     pub fn bytes_per_cluster(mut self, bytes_per_cluster: u32) -> Self {
         assert!(
-            bytes_per_cluster.count_ones() == 1 && bytes_per_cluster >= 512,
+            bytes_per_cluster.is_power_of_two() && bytes_per_cluster >= 512,
             "Invalid bytes_per_cluster"
         );
         self.bytes_per_cluster = Some(bytes_per_cluster);
@@ -1011,7 +1011,7 @@ impl FormatVolumeOptions {
     #[must_use]
     pub fn bytes_per_sector(mut self, bytes_per_sector: u16) -> Self {
         assert!(
-            bytes_per_sector.count_ones() == 1 && bytes_per_sector >= 512,
+            bytes_per_sector.is_power_of_two() && bytes_per_sector >= 512,
             "Invalid bytes_per_sector"
         );
         self.bytes_per_sector = bytes_per_sector;