Skip to content

Commit 2d7786e

Browse files
committed
fix some clippy warnings
1 parent a5136d6 commit 2d7786e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl<const ORDER: usize> FrameAllocator<ORDER> {
115115
}
116116
}
117117

118-
let result = self.free_list[class].iter().next().clone();
118+
let result = self.free_list[class].iter().next();
119119
if let Some(result_ref) = result {
120120
let result = *result_ref;
121121
self.free_list[class].remove(&result);
@@ -155,7 +155,7 @@ impl<const ORDER: usize> FrameAllocator<ORDER> {
155155
let mut current_class = class;
156156
while current_class < self.free_list.len() {
157157
let buddy = current_ptr ^ (1 << current_class);
158-
if self.free_list[current_class].remove(&buddy) == true {
158+
if self.free_list[current_class].remove(&buddy) {
159159
// Free buddy found
160160
current_ptr = min(current_ptr, buddy);
161161
current_class += 1;

src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ extern crate spin;
1010

1111
extern crate alloc;
1212

13-
use core::alloc::{GlobalAlloc, Layout};
13+
#[cfg(feature = "use_spin")]
14+
use core::alloc::GlobalAlloc;
15+
use core::alloc::Layout;
1416
use core::cmp::{max, min};
1517
use core::fmt;
1618
use core::mem::size_of;
@@ -76,7 +78,7 @@ impl<const ORDER: usize> Heap<ORDER> {
7678
pub unsafe fn add_to_heap(&mut self, mut start: usize, mut end: usize) {
7779
// avoid unaligned access on some platforms
7880
start = (start + size_of::<usize>() - 1) & (!size_of::<usize>() + 1);
79-
end = end & (!size_of::<usize>() + 1);
81+
end &= !size_of::<usize>() + 1;
8082
assert!(start <= end);
8183

8284
let mut total = 0;
@@ -338,5 +340,5 @@ unsafe impl<const ORDER: usize> GlobalAlloc for LockedHeapWithRescue<ORDER> {
338340
}
339341

340342
pub(crate) fn prev_power_of_two(num: usize) -> usize {
341-
1 << (8 * (size_of::<usize>()) - num.leading_zeros() as usize - 1)
343+
1 << (usize::BITS as usize - num.leading_zeros() as usize - 1)
342344
}

0 commit comments

Comments
 (0)