Skip to content

Commit

Permalink
misc: Remove manual implementation of is_power_of_two
Browse files Browse the repository at this point in the history
As clippy of rust-toolchain version 1.83.0-beta.1 suggests, remove
manual implementation of `is_power_of_two` to improve readability.

Signed-off-by: Ruoqing He <[email protected]>
  • Loading branch information
RuoqingHe authored and rbradford committed Oct 18, 2024
1 parent 6164aa0 commit b41dadd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion block/src/qcow/qcow_raw_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl QcowRawFile {
/// Creates a `QcowRawFile` from the given `File`, `None` is returned if `cluster_size` is not
/// a power of two.
pub fn from(file: RawFile, cluster_size: u64) -> Option<Self> {
if cluster_size.count_ones() != 1 {
if !cluster_size.is_power_of_two() {
return None;
}
Some(QcowRawFile {
Expand Down
4 changes: 2 additions & 2 deletions pci/src/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ impl PciConfiguration {
return Err(Error::BarInUse(bar_idx));
}

if config.size.count_ones() != 1 {
if !config.size.is_power_of_two() {
return Err(Error::BarSizeInvalid(config.size));
}

Expand Down Expand Up @@ -806,7 +806,7 @@ impl PciConfiguration {
return Err(Error::RomBarInUse(bar_idx));
}

if config.size.count_ones() != 1 {
if !config.size.is_power_of_two() {
return Err(Error::RomBarSizeInvalid(config.size));
}

Expand Down
2 changes: 1 addition & 1 deletion vm-virtio/src/queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ pub mod testing {
// We try to make sure things are aligned properly :-s
pub fn new(start: GuestAddress, mem: &'a GuestMemoryMmap, qsize: u16) -> Self {
// power of 2?
assert!(qsize > 0 && qsize & (qsize - 1) == 0);
assert!(qsize.is_power_of_two());

let mut dtable = Vec::with_capacity(qsize as usize);

Expand Down

0 comments on commit b41dadd

Please sign in to comment.